X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_holmes.pas;h=570a1d99565d7d6e547b6418880d14011c80b86b;hb=44103c4d02f0720ffd6fa801e2d2b09f596d6b6e;hp=566cd19c61b5b5eddb211b79e43f625ee56d06d7;hpb=b0369ee9442a79c9ace3454e7e1709cd61ed6a8e;p=d2df-sdl.git diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas index 566cd19..570a1d9 100644 --- a/src/game/g_holmes.pas +++ b/src/game/g_holmes.pas @@ -101,6 +101,7 @@ var implementation uses + {rttiobj,} typinfo, SysUtils, Classes, GL, SDL2, MAPDEF, g_main, g_options, utils, hashtable, xparser; @@ -112,14 +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)}true{$ELSE}false{$ENDIF}; + showTriggers: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF}; // ////////////////////////////////////////////////////////////////////////// // {$INCLUDE g_holmes.inc} @@ -247,7 +248,86 @@ end; // ////////////////////////////////////////////////////////////////////////// // -//FIXME +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 := ''; @@ -592,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); @@ -961,12 +1041,12 @@ procedure plrDebugDraw (); procedure drawTrigger (var trig: TTrigger); - procedure drawPanelDest (var parr: TPanelArray; idx: Integer); + procedure drawPanelDest (pguid: Integer); var pan: TPanel; begin - if (idx < 0) or (idx >= Length(parr)) then exit; - pan := parr[idx]; + 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, @@ -985,32 +1065,36 @@ procedure plrDebugDraw (); 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 drawPanelDest(gWalls, trig.trigPanelId); end; - TRIGGER_CLOSEDOOR: begin drawPanelDest(gWalls, trig.trigPanelId); end; - TRIGGER_DOOR: begin drawPanelDest(gWalls, trig.trigPanelId); end; - TRIGGER_DOOR5: begin drawPanelDest(gWalls, trig.trigPanelId); end; - TRIGGER_CLOSETRAP: begin drawPanelDest(gWalls, trig.trigPanelId); end; - TRIGGER_TRAP: begin drawPanelDest(gWalls, trig.trigPanelId); 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 drawPanelDest(gLifts, trig.trigPanelId); end; - TRIGGER_LIFTDOWN: begin drawPanelDest(gLifts, trig.trigPanelId); end; - TRIGGER_LIFT: begin drawPanelDest(gLifts, trig.trigPanelId); 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 - 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); + 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; @@ -1046,7 +1130,7 @@ begin glScissor(0, gWinSizeY-gPlayerScreenSize.Y-1, vpw, vph); glPushMatrix(); - if g_dbg_scale_05 then glScalef(0.5, 0.5, 1.0); + glScalef(g_dbg_scale, g_dbg_scale, 1.0); glTranslatef(-vpx, -vpy, 0); if (showGrid) then drawTileGrid(); @@ -1223,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); @@ -1247,7 +1347,8 @@ 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; @@ -1277,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);