X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_holmes.pas;h=570a1d99565d7d6e547b6418880d14011c80b86b;hb=66d9ad247935e99fe7161849b71ed952cbb85508;hp=dfa8a00c5bb6eb86df978e88a432af2ad1bd7628;hpb=6d6df4e3427cd01e03e172984c9d0d391ff38032;p=d2df-sdl.git diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas index dfa8a00..570a1d9 100644 --- a/src/game/g_holmes.pas +++ b/src/game/g_holmes.pas @@ -101,8 +101,10 @@ var implementation uses + {rttiobj,} typinfo, SysUtils, Classes, GL, SDL2, - MAPDEF, g_main, g_options, utils, hashtable, xparser; + MAPDEF, g_main, g_options, + utils, hashtable, xparser; var @@ -111,13 +113,14 @@ var msY: Integer = -666; msB: Word = 0; // button state kbS: Word = 0; // keyboard modifiers state - showGrid: Boolean = true; + showGrid: Boolean = false; showMonsInfo: Boolean = false; showMonsLOS2Plr: Boolean = false; showAllMonsCells: Boolean = false; showMapCurPos: Boolean = false; showLayersWindow: Boolean = false; showOutlineWindow: Boolean = false; + showTriggers: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF}; // ////////////////////////////////////////////////////////////////////////// // {$INCLUDE g_holmes.inc} @@ -244,6 +247,124 @@ begin end; +// ////////////////////////////////////////////////////////////////////////// // +function typeKind2Str (t: TTypeKind): AnsiString; +begin + case t of + tkUnknown: result := 'Unknown'; + tkInteger: result := 'Integer'; + tkChar: result := 'Char'; + tkEnumeration: result := 'Enumeration'; + tkFloat: result := 'Float'; + tkSet: result := 'Set'; + tkMethod: result := 'Method'; + tkSString: result := 'SString'; + tkLString: result := 'LString'; + tkAString: result := 'AString'; + tkWString: result := 'WString'; + tkVariant: result := 'Variant'; + tkArray: result := 'Array'; + tkRecord: result := 'Record'; + tkInterface: result := 'Interface'; + tkClass: result := 'Class'; + tkObject: result := 'Object'; + tkWChar: result := 'WChar'; + tkBool: result := 'Bool'; + tkInt64: result := 'Int64'; + tkQWord: result := 'QWord'; + tkDynArray: result := 'DynArray'; + tkInterfaceRaw: result := 'InterfaceRaw'; + tkProcVar: result := 'ProcVar'; + tkUString: result := 'UString'; + tkUChar: result := 'UChar'; + tkHelper: result := 'Helper'; + tkFile: result := 'File'; + tkClassRef: result := 'ClassRef'; + tkPointer: result := 'Pointer'; + else result := ''; + end; +end; + + +procedure dumpPublishedProperties (obj: TObject); +var + pt: PTypeData; + pi: PTypeInfo; + i, j: Integer; + pp: PPropList; +begin + if (obj = nil) then exit; + e_LogWritefln('Object of type ''%s'':', [obj.ClassName]); + pi := obj.ClassInfo; + pt := GetTypeData(pi); + e_LogWritefln('property count: %s', [pt.PropCount]); + GetMem(pp, pt^.PropCount*sizeof(Pointer)); + try + j := GetPropList(pi, [tkInteger, tkBool, tkSString, tkLString, tkAString, tkSet, tkEnumeration], pp); + //e_LogWritefln('ordinal property count: %s', [j]); + for i := 0 to j-1 do + begin + if (typinfo.PropType(obj, pp^[i].name) in [tkSString, tkLString, tkAString]) then + begin + e_LogWritefln(' #%s: <%s>; type: %s; value: <%s>', [i+1, pp^[i].name, typeKind2Str(typinfo.PropType(obj, pp^[i].name)), GetStrProp(obj, pp^[i])]); + end + else if (typinfo.PropType(obj, pp^[i].name) = tkSet) then + begin + e_LogWritefln(' #%s: <%s>; type: %s; value: %s', [i+1, pp^[i].name, typeKind2Str(typinfo.PropType(obj, pp^[i].name)), GetSetProp(obj, pp^[i], true)]); + end + else if (typinfo.PropType(obj, pp^[i].name) = tkEnumeration) then + begin + e_LogWritefln(' #%s: <%s>; type: %s; value: <%s>', [i+1, pp^[i].name, typeKind2Str(typinfo.PropType(obj, pp^[i].name)), GetEnumProp(obj, pp^[i])]); + end + else + begin + e_LogWritefln(' #%s: <%s>; type: %s; value: %s', [i+1, pp^[i].name, typeKind2Str(typinfo.PropType(obj, pp^[i].name)), GetOrdProp(obj, pp^[i])]); + end; + end; + finally + FreeMem(pp); + end; +end; + + +//FIXME: autogenerate +function trigType2Str (ttype: Integer): AnsiString; +begin + result := ''; + case ttype of + TRIGGER_NONE: result := 'none'; + TRIGGER_EXIT: result := 'exit'; + TRIGGER_TELEPORT: result := 'teleport'; + TRIGGER_OPENDOOR: result := 'opendoor'; + TRIGGER_CLOSEDOOR: result := 'closedoor'; + TRIGGER_DOOR: result := 'door'; + TRIGGER_DOOR5: result := 'door5'; + TRIGGER_CLOSETRAP: result := 'closetrap'; + TRIGGER_TRAP: result := 'trap'; + TRIGGER_PRESS: result := 'press'; + TRIGGER_SECRET: result := 'secret'; + TRIGGER_LIFTUP: result := 'liftup'; + TRIGGER_LIFTDOWN: result := 'liftdown'; + TRIGGER_LIFT: result := 'lift'; + TRIGGER_TEXTURE: result := 'texture'; + TRIGGER_ON: result := 'on'; + TRIGGER_OFF: result := 'off'; + TRIGGER_ONOFF: result := 'onoff'; + TRIGGER_SOUND: result := 'sound'; + TRIGGER_SPAWNMONSTER: result := 'spawnmonster'; + TRIGGER_SPAWNITEM: result := 'spawnitem'; + TRIGGER_MUSIC: result := 'music'; + TRIGGER_PUSH: result := 'push'; + TRIGGER_SCORE: result := 'score'; + TRIGGER_MESSAGE: result := 'message'; + TRIGGER_DAMAGE: result := 'damage'; + TRIGGER_HEALTH: result := 'health'; + TRIGGER_SHOT: result := 'shot'; + TRIGGER_EFFECT: result := 'effect'; + TRIGGER_SCRIPT: result := 'script'; + end; +end; + // ////////////////////////////////////////////////////////////////////////// // {$INCLUDE g_holmes_cmd.inc} procedure holmesInitCommands (); forward; @@ -461,6 +582,7 @@ begin llb.appendItem('monster info', @showMonsInfo); llb.appendItem('monster LOS to player', @showMonsLOS2Plr); llb.appendItem('monster cells (SLOW!)', @showAllMonsCells); + llb.appendItem('draw triggers (SLOW!)', @showTriggers); llb.appendItem('WINDOWS', nil); llb.appendItem('layers window', @showLayersWindow, toggleLayersWindowCB); llb.appendItem('outline window', @showOutlineWindow, toggleOutlineWindowCB); @@ -550,8 +672,8 @@ begin end; -function pmsCurMapX (): Integer; inline; begin result := msX+vpx; end; -function pmsCurMapY (): Integer; inline; begin result := msY+vpy; end; +function pmsCurMapX (): Integer; inline; begin result := round(msX/g_dbg_scale)+vpx; end; +function pmsCurMapY (): Integer; inline; begin result := round(msY/g_dbg_scale)+vpy; end; procedure plrDebugMouse (var ev: THMouseEvent); @@ -917,6 +1039,87 @@ procedure plrDebugDraw (); monsGrid.forEachBodyCell(mon.proxyId, hilightCell); end; + procedure drawTrigger (var trig: TTrigger); + + procedure drawPanelDest (pguid: Integer); + var + pan: TPanel; + begin + pan := g_Map_PanelByGUID(pguid); + if (pan = nil) then exit; + drawLine( + trig.trigCenter.x, trig.trigCenter.y, + pan.x+pan.width div 2, pan.y+pan.height div 2, + 255, 0, 255, 220); + end; + + var + tts: AnsiString; + tx: Integer; + begin + fillRect(trig.x, trig.y, trig.width, trig.height, 255, 0, 255, 96); + tts := trigType2Str(trig.TriggerType); + tx := trig.x+(trig.width-Length(tts)*6) div 2; + darkenRect(tx-2, trig.y-10, Length(tts)*6+4, 10, 64); + drawText6(tx, trig.y-9, tts, 255, 127, 0); + tx := trig.x+(trig.width-Length(trig.mapId)*6) div 2; + darkenRect(tx-2, trig.y-20, Length(trig.mapId)*6+4, 10, 64); + drawText6(tx, trig.y-19, trig.mapId, 255, 255, 0); + drawPanelDest(trig.trigPanelGUID); + case trig.TriggerType of + TRIGGER_NONE: begin end; + TRIGGER_EXIT: begin end; + TRIGGER_TELEPORT: begin end; + TRIGGER_OPENDOOR: begin end; + TRIGGER_CLOSEDOOR: begin end; + TRIGGER_DOOR: begin end; + TRIGGER_DOOR5: begin end; + TRIGGER_CLOSETRAP: begin end; + TRIGGER_TRAP: begin end; + TRIGGER_SECRET: begin end; + TRIGGER_LIFTUP: begin end; + TRIGGER_LIFTDOWN: begin end; + TRIGGER_LIFT: begin end; + TRIGGER_TEXTURE: begin end; + TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF, TRIGGER_PRESS: + begin + if (trig.trigData.trigTWidth > 0) and (trig.trigData.trigTHeight > 0) then + begin + fillRect( + trig.trigData.trigTX, trig.trigData.trigTY, + trig.trigData.trigTWidth, trig.trigData.trigTHeight, + 0, 255, 255, 42); + drawLine( + trig.trigCenter.x, trig.trigCenter.y, + trig.trigData.trigTX+trig.trigData.trigTWidth div 2, + trig.trigData.trigTY+trig.trigData.trigTHeight div 2, + 255, 0, 255, 220); + end; + end; + TRIGGER_SOUND: begin end; + TRIGGER_SPAWNMONSTER: begin end; + TRIGGER_SPAWNITEM: begin end; + TRIGGER_MUSIC: begin end; + TRIGGER_PUSH: begin end; + TRIGGER_SCORE: begin end; + TRIGGER_MESSAGE: begin end; + TRIGGER_DAMAGE: begin end; + TRIGGER_HEALTH: begin end; + TRIGGER_SHOT: begin end; + TRIGGER_EFFECT: begin end; + TRIGGER_SCRIPT: begin end; + end; + //trigType2Str + //trigPanelId: Integer; + end; + + procedure drawTriggers (); + var + f: Integer; + begin + for f := 0 to High(gTriggers) do drawTrigger(gTriggers[f]); + end; + var mon: TMonster; mx, my, mw, mh: Integer; @@ -927,6 +1130,7 @@ begin glScissor(0, gWinSizeY-gPlayerScreenSize.Y-1, vpw, vph); glPushMatrix(); + glScalef(g_dbg_scale, g_dbg_scale, 1.0); glTranslatef(-vpx, -vpy, 0); if (showGrid) then drawTileGrid(); @@ -946,6 +1150,7 @@ begin end; if showAllMonsCells then g_Mons_ForEach(highlightAllMonsterCells); + if showTriggers then drawTriggers(); glPopMatrix(); @@ -1034,6 +1239,7 @@ end; // ////////////////////////////////////////////////////////////////////////// // procedure g_Holmes_Draw (); begin + {$IF not DEFINED(HEADLESS)} holmesInitCommands(); holmesInitBinds(); @@ -1047,6 +1253,7 @@ begin begin plrDebugDraw(); end; + {$ENDIF} laserSet := false; end; @@ -1054,8 +1261,10 @@ end; procedure g_Holmes_DrawUI (); begin + {$IF not DEFINED(HEADLESS)} uiDraw(); drawCursor(); + {$ENDIF} end; @@ -1064,6 +1273,7 @@ procedure bcOneMonsterThinkStep (); begin gmon_debug_think := false; gmon_debug_ procedure bcToggleMonsterInfo (arg: Integer=-1); begin if (arg < 0) then showMonsInfo := not showMonsInfo else showMonsInfo := (arg > 0); end; procedure bcToggleMonsterLOSPlr (arg: Integer=-1); begin if (arg < 0) then showMonsLOS2Plr := not showMonsLOS2Plr else showMonsLOS2Plr := (arg > 0); end; procedure bcToggleMonsterCells (arg: Integer=-1); begin if (arg < 0) then showAllMonsCells := not showAllMonsCells else showAllMonsCells := (arg > 0); end; +procedure bcToggleDrawTriggers (arg: Integer=-1); begin if (arg < 0) then showTriggers := not showTriggers else showTriggers := (arg > 0); end; procedure bcToggleCurPos (arg: Integer=-1); begin if (arg < 0) then showMapCurPos := not showMapCurPos else showMapCurPos := (arg > 0); end; procedure bcToggleGrid (arg: Integer=-1); begin if (arg < 0) then showGrid := not showGrid else showGrid := (arg > 0); end; @@ -1097,9 +1307,25 @@ procedure cbAtcurSelectMonster (); result := true; // stop e_WriteLog(Format('monster #%d (UID:%u) (proxyid:%d)', [mon.arrIdx, mon.UID, mon.proxyId]), MSG_NOTIFY); monMarkedUID := mon.UID; + dumpPublishedProperties(mon); end; +var + plr: TPlayer; + x, y, w, h: Integer; begin monMarkedUID := -1; + if (Length(gPlayers) > 0) then + begin + plr := gPlayers[0]; + if (plr <> nil) then + begin + plr.getMapBox(x, y, w, h); + if (pmsCurMapX >= x) and (pmsCurMapY >= y) and (pmsCurMapX < x+w) and (pmsCurMapY < y+h) then + begin + dumpPublishedProperties(plr); + end; + end; + end; //e_WriteLog('===========================', MSG_NOTIFY); monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, monsAtDump); //e_WriteLog('---------------------------', MSG_NOTIFY); @@ -1121,12 +1347,30 @@ procedure cbAtcurDumpWalls (); function wallToggle (pan: TPanel; tag: Integer): Boolean; begin result := false; // don't stop - e_WriteLog(Format('wall #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY); + e_LogWritefln('wall #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]); + dumpPublishedProperties(pan); end; +var + hasTrigs: Boolean = false; + f: Integer; + trig: PTrigger; begin e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY); mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, wallToggle, (GridTagWall or GridTagDoor)); e_WriteLog('--- toggle wall ---', MSG_NOTIFY); + if showTriggers then + begin + for f := 0 to High(gTriggers) do + begin + trig := @gTriggers[f]; + if (pmsCurMapX >= trig.x) and (pmsCurMapY >= trig.y) and (pmsCurMapX < trig.x+trig.width) and (pmsCurMapY < trig.y+trig.height) then + begin + if not hasTrigs then begin writeln('=== TRIGGERS ==='); hasTrigs := true; end; + writeln('trigger ''', trig.mapId, ''' of type ''', trigType2Str(trig.TriggerType), ''''); + end; + end; + if hasTrigs then writeln('--- triggers ---'); + end; end; procedure cbAtcurToggleWalls (); @@ -1134,7 +1378,7 @@ procedure cbAtcurToggleWalls (); begin result := false; // don't stop //e_WriteLog(Format('wall #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY); - if pan.Enabled then g_Map_DisableWall(pan.arrIdx) else g_Map_EnableWall(pan.arrIdx); + if pan.Enabled then g_Map_DisableWallGUID(pan.guid) else g_Map_EnableWallGUID(pan.guid); end; begin //e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY); @@ -1162,6 +1406,7 @@ begin cmdAdd('dbg_curpos', bcToggleCurPos, 'toggle "show cursor position on the map"', 'various'); cmdAdd('dbg_grid', bcToggleGrid, 'toggle grid', 'various'); + cmdAdd('dbg_triggers', bcToggleDrawTriggers, 'show/hide triggers (SLOW!)', 'various'); cmdAdd('atcur_select_monster', cbAtcurSelectMonster, 'select monster to operate', 'monster control'); cmdAdd('atcur_dump_monsters', cbAtcurDumpMonsters, 'dump monsters in cell', 'monster control'); @@ -1197,6 +1442,7 @@ begin keybindAdd('C-P', 'dbg_curpos'); keybindAdd('C-G', 'dbg_grid'); + keybindAdd('C-X', 'dbg_triggers'); // mouse msbindAdd('LMB', 'atcur_select_monster');