diff --git a/src/console.pas b/src/console.pas
index d6fb2f37431ba2a338b4a21739727ee181e79929..3d227f8bc503cc84e8a558b833dc2f4da3a12d60 100644 (file)
--- a/src/console.pas
+++ b/src/console.pas
\r
interface\r
const\r
\r
interface\r
const\r
- version='BETA 8 FIX';\r
+ version = 'BETA 9 DEV B12';\r
+\r
var\r
osadki:boolean;\r
bl_upd:integer;\r
s_get_drp:boolean;\r
var\r
osadki:boolean;\r
bl_upd:integer;\r
s_get_drp:boolean;\r
- particle_upd:boolean;\r
drw_back:boolean;\r
drw_sm:boolean;\r
s_max_fps:integer;\r
drw_back:boolean;\r
drw_sm:boolean;\r
s_max_fps:integer;\r
light_type:integer;\r
\r
ifosad:boolean;\r
light_type:integer;\r
\r
ifosad:boolean;\r
- //s_particles:boolean; - module\r
\r
load_sm:integer;\r
load_sky_siz:integer;\r
load_back_tex:boolean;\r
load_weather_tex:boolean;\r
\r
load_sm:integer;\r
load_sky_siz:integer;\r
load_back_tex:boolean;\r
load_weather_tex:boolean;\r
- load_particles_tex:boolean;\r
load_light_tex:boolean;\r
load_gui_tex:boolean;\r
\r
load_light_tex:boolean;\r
load_gui_tex:boolean;\r
\r
\r
sd:string;\r
\r
\r
sd:string;\r
\r
- //max_particles:integer; - module\r
+ EOFstr, ENDstr:boolean;\r
\r
procedure save_settings;\r
procedure load_settings;\r
procedure call_console;\r
\r
procedure save_settings;\r
procedure load_settings;\r
procedure call_console;\r
- procedure exec(s, search:string; acces:boolean);\r
+ procedure exec(s, search:string);\r
procedure addToLog(str:string);\r
\r
implementation\r
procedure addToLog(str:string);\r
\r
implementation\r
-uses keyboard,particles_store,vars,maps,items,canvas,mob,worldgen,jsr75i,particles,func, player,sensor, drop, inv, furnace, items_store, video;\r
+\r
+ uses\r
+ keyboard,\r
+ vars,\r
+ maps,\r
+ canvas,\r
+ mobs,\r
+ worldgen,\r
+ jsr75i,\r
+ particles,\r
+ func,\r
+ player,\r
+ sensor,\r
+ drop,\r
+ inv,\r
+ furnace,\r
+ items_store,\r
+ video;\r
+\r
const\r
CON_LOG_SIZE=9;\r
PARSER_MAX_STR=15;\r
MAX_IMGREG=2;\r
const\r
CON_LOG_SIZE=9;\r
PARSER_MAX_STR=15;\r
MAX_IMGREG=2;\r
+\r
var\r
logSTR: array [0..CON_LOG_SIZE] of string;\r
lastCommand:string;\r
\r
parseStr:string;\r
var\r
logSTR: array [0..CON_LOG_SIZE] of string;\r
lastCommand:string;\r
\r
parseStr:string;\r
- EOFstr, ENDstr:boolean;\r
\r
stack: array [0..0] of integer;\r
stack_pointer:integer;\r
\r
\r
stack: array [0..0] of integer;\r
stack_pointer:integer;\r
\r
- autoexec_acces:boolean;\r
regimg:image;\r
\r
procedure resetStack(size:integer);\r
regimg:image;\r
\r
procedure resetStack(size:integer);\r
t:=addRecordStoreEntry(rs,version);\r
t:=addRecordStoreEntry(rs,''+light_type);\r
t:=addRecordStoreEntry(rs,''+ifosad);\r
t:=addRecordStoreEntry(rs,version);\r
t:=addRecordStoreEntry(rs,''+light_type);\r
t:=addRecordStoreEntry(rs,''+ifosad);\r
- t:=addRecordStoreEntry(rs,''+s_particles);\r
+ t:=addRecordStoreEntry(rs, '' + Particles.enabled);\r
t:=addRecordStoreEntry(rs,''+drawgui);\r
t:=addRecordStoreEntry(rs,''+s_jpeg_quality);\r
t:=addRecordStoreEntry(rs,''+load_key_tex);\r
t:=addRecordStoreEntry(rs,''+drawgui);\r
t:=addRecordStoreEntry(rs,''+s_jpeg_quality);\r
t:=addRecordStoreEntry(rs,''+load_key_tex);\r
end;\r
light_type:=stringtointeger(readRecordStoreEntry(rs,2));\r
ifosad:=sett_ld_bool(readRecordStoreEntry(rs,3));\r
end;\r
light_type:=stringtointeger(readRecordStoreEntry(rs,2));\r
ifosad:=sett_ld_bool(readRecordStoreEntry(rs,3));\r
- s_particles:=sett_ld_bool(readRecordStoreEntry(rs,4));\r
+ Particles.enabled := sett_ld_bool(readRecordStoreEntry(rs, 4));\r
drawgui:=sett_ld_bool(readRecordStoreEntry(rs,5));\r
s_jpeg_quality:=stringtointeger(readRecordStoreEntry(rs,6));\r
load_key_tex:=stringtointeger(readRecordStoreEntry(rs,7));\r
drawgui:=sett_ld_bool(readRecordStoreEntry(rs,5));\r
s_jpeg_quality:=stringtointeger(readRecordStoreEntry(rs,6));\r
load_key_tex:=stringtointeger(readRecordStoreEntry(rs,7));\r
\r
com:=UpCase(nextWord);\r
\r
\r
com:=UpCase(nextWord);\r
\r
- if (cheats) or (autoexec_acces) or (gamemode=1) then\r
+ if (cheats) or (gamemode=1) then\r
begin\r
if com='TIME' then\r
game_time:=decodeInt(nextWord);\r
begin\r
if com='TIME' then\r
game_time:=decodeInt(nextWord);\r
fly:=false;\r
end;\r
else\r
fly:=false;\r
end;\r
else\r
- {if com='KILL_MOBS' then\r
- for i:=0 to 31 do\r
- begin\r
- mob[i].m_type:=0;\r
- mob[i].m_hp:=0;\r
- end;\r
- else}\r
if com='SPAWN' then\r
begin\r
player.setX(get_spawn_x*16+4);\r
if com='SPAWN' then\r
begin\r
player.setX(get_spawn_x*16+4);\r
if com='GET_DRP' then\r
s_get_drp:=strToBool(nextWord);\r
else\r
if com='GET_DRP' then\r
s_get_drp:=strToBool(nextWord);\r
else\r
- {if com='AI_UPD' then\r
- ai_upd:=strToBool(nextWord);\r
- else}\r
- if com='PRT_UPD' then\r
- particle_upd:=strToBool(nextWord);\r
- else\r
if com='MAX_FPS' then\r
s_max_fps:=decodeInt(nextWord); else\r
if com='DRW_BACK' then\r
if com='MAX_FPS' then\r
s_max_fps:=decodeInt(nextWord); else\r
if com='DRW_BACK' then\r
light_type:=decodeInt(nextWord);\r
else\r
if com='S_PARTICLES' then\r
light_type:=decodeInt(nextWord);\r
else\r
if com='S_PARTICLES' then\r
- s_particles:=strToBool(nextWord);\r
+ Particles.enabled := strToBool(nextWord);\r
else\r
if com='LOAD_SKY' then\r
load_sky_siz:=decodeInt(nextWord);\r
else\r
if com='LOAD_SKY' then\r
load_sky_siz:=decodeInt(nextWord);\r
if com='LOAD_WEATHER_TEX' then\r
load_weather_tex:=strToBool(nextWord);\r
else\r
if com='LOAD_WEATHER_TEX' then\r
load_weather_tex:=strToBool(nextWord);\r
else\r
- if com='LOAD_PARTICLES_TEX' then\r
- load_particles_tex:=strToBool(nextWord);\r
- else\r
if com='LOAD_LIGHT_TEX' then\r
load_light_tex:=strToBool(nextWord);\r
else\r
if com='LOAD_LIGHT_TEX' then\r
load_light_tex:=strToBool(nextWord);\r
else\r
if com='LOAD_MINIMAP_TEX' then\r
load_minimap_tex:=strToBool(nextWord);\r
else\r
if com='LOAD_MINIMAP_TEX' then\r
load_minimap_tex:=strToBool(nextWord);\r
else\r
- if com='MAX_PARTICLES' then\r
- begin\r
- max_particles:=decodeInt(nextWord);\r
- reset_particles(max_particles+1);\r
- end;\r
- else\r
if com='EXEC' then\r
begin\r
tmp:=nextWord;\r
if com='EXEC' then\r
begin\r
tmp:=nextWord;\r
- exec(nextWord, tmp, autoexec_acces);\r
+ exec(nextWord, tmp);\r
end;\r
else\r
if com='RESET_ITEMS' then\r
end;\r
else\r
if com='RESET_ITEMS' then\r
end;\r
else\r
if com='LOAD_TEX' then\r
end;\r
else\r
if com='LOAD_TEX' then\r
- regimg:=ld_tex(nextWord, '/'+sd+'/cavecraft/', '');\r
+ begin\r
+ regimg:=ld_tex(nextWord, '/'+sd+'/cavecraft/texturepacks/'+tex_pack+'/', '');\r
+ end;\r
else\r
if com='RESET_TEX' then\r
resetTmpImg;\r
else\r
if com='RESET_TEX' then\r
resetTmpImg;\r
decodeInt(tmp2));\r
end;\r
else\r
decodeInt(tmp2));\r
end;\r
else\r
- if com='SET_MAX_ITEM_LIST' then\r
- setMaxItemList(decodeInt(nextWord));\r
- else\r
- if com='SET_ITEM_LIST' then\r
- setItemList(decodeInt(nextWord),\r
- decodeInt(nextWord));\r
- else\r
if com='BIND_KEY' then\r
begin\r
tmp:=nextWord;\r
if com='BIND_KEY' then\r
begin\r
tmp:=nextWord;\r
forever;\r
end;\r
\r
forever;\r
end;\r
\r
-procedure exec(s, search:string; acces:boolean);\r
+procedure exec(s, search:string);\r
var\r
res:resource;\r
str:string;\r
var\r
res:resource;\r
str:string;\r
- tmp_acces, tmpEOF:boolean;\r
+ tmpEOF : Boolean;\r
begin\r
begin\r
- tmp_acces:=autoexec_acces;\r
- autoexec_acces:=acces;\r
-\r
search:=UpCase(search);\r
\r
if search='LOCAL' then\r
search:=UpCase(search);\r
\r
if search='LOCAL' then\r
else\r
begin\r
addToLog('Unknown load type "'+search+'", file "'+s+'" not executed!');\r
else\r
begin\r
addToLog('Unknown load type "'+search+'", file "'+s+'" not executed!');\r
- autoexec_acces:=tmp_acces;\r
exit;\r
end;\r
\r
exit;\r
end;\r
\r
else\r
addToLog('Execute file "'+s+'" not found!');\r
\r
else\r
addToLog('Execute file "'+s+'" not found!');\r
\r
+ EOFstr := false;\r
+ ENDstr := false;\r
CloseResource(res);\r
CloseResource(res);\r
- autoexec_acces:=tmp_acces;\r
end;\r
\r
initialization\r
end;\r
\r
initialization\r