1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed most of my thousands "WANNE" comments which goes back 2 years when I changed to higher resolutions. These were only internal comments for me, so they didn't include any useful meaning for others.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2007-08-07 21:39:23 +00:00
parent 30bccc0d73
commit ce31084ae7
98 changed files with 82 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/Cursor Modes.cpp
-2
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -341,7 +340,6 @@ BOOLEAN HandleAreaSelection()
void ValidateSelectionRegionBoundaries()
{
// WANNE: EDITOR?
gSelectRegion.iLeft = max( min( 159, gSelectRegion.iLeft ) , 0 );
gSelectRegion.iRight = max( min( 159, gSelectRegion.iRight ), 0 );
gSelectRegion.iTop = max( min( 159, gSelectRegion.iTop ) , 0 );
Editor/Editor Callbacks.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/Editor Modes.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/Editor Taskbar Creation.cpp
-2
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -417,7 +416,6 @@ void InitEditorMercsToolbar()
iScreenWidthOffset + 516, 2 * iScreenHeightOffset + 362, 77, 16, BUTTON_NO_TOGGLE, MSYS_PRIORITY_NORMAL, DEFAULT_MOVE_CALLBACK, MercsScheduleClearCallback );
HideEditorButtons( MERCS_SCHEDULE_DATA1A, MERCS_SCHEDULE_DATA4B );
// WANNE: continue
iEditorButton[ MERCS_HEAD_SLOT ] =
CreateCheckBoxButton( MERCPANEL_X+61, MERCPANEL_Y+0, "EDITOR//smCheckbox.sti", MSYS_PRIORITY_NORMAL+1, MercsInventorySlotCallback );
MSYS_SetBtnUserData( iEditorButton[ MERCS_HEAD_SLOT ], 0, HELMETPOS );
Editor/Editor Taskbar Utils.cpp
+3 -8
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR?
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -447,7 +446,6 @@ void mprintfEditor(INT16 x, INT16 y, STR16 pFontString, ...)
mprintf( x, y, string );
}
// WANNE: EDITOR continue
void ClearTaskbarRegion( INT16 sLeft, INT16 sTop, INT16 sRight, INT16 sBottom )
{
ColorFillVideoSurfaceArea( ButtonDestBuffer, sLeft, sTop, sRight, sBottom, gusEditorTaskbarColor );
@@ -730,7 +728,6 @@ void BuildTriggerName( OBJECTTYPE *pItem, STR16 szItemName )
}
}
// WANNE: EDITOR?
void RenderDoorLockInfo()
{
INT16 i, xp, yp;
@@ -782,7 +779,6 @@ void RenderDoorLockInfo()
}
}
// WANNE: EDITOR?
void RenderSelectedItemBlownUp()
{
UINT32 uiVideoObjectIndex;
@@ -899,7 +895,7 @@ void RenderEditorInfo( )
break;
case TASK_TERRAIN:
// WANNE: EDITOR: comment this two lines, because we always get an exception here!
// WANNE: Comment this two lines, because we always get an exception here.
//if( gusSelectionType == LINESELECTION )
// swprintf( wszSelType[LINESELECTION], L"Width: %d", gusSelectionWidth );
@@ -915,7 +911,7 @@ void RenderEditorInfo( )
UpdateBuildingsInfo();
// WANNE: EDITOR: comment this two lines, because we always get an exception here!
// WANNE: Comment this two lines, because we always get an exception here.
//if( gusSelectionType == LINESELECTION )
// swprintf( wszSelType[LINESELECTION], L"%d", gusSelectionWidth );
@@ -926,7 +922,7 @@ void RenderEditorInfo( )
break;
case TASK_MAPINFO:
UpdateMapInfo();
// WANNE: EDITOR: comment this two lines, because we always get an exception here!
// WANNE: EDITOR: Comment this two lines, because we always get an exception here!
//if( gusSelectionType == LINESELECTION )
// swprintf( wszSelType[LINESELECTION], L"Width: %d", gusSelectionWidth );
@@ -991,7 +987,6 @@ void ProcessEditorRendering()
if( fSaveBuffer )
// WANNE: EDITOR?
BlitBufferToBuffer( FRAME_BUFFER, guiSAVEBUFFER, 0, 2 * iScreenHeightOffset + 360, SCREEN_WIDTH, 120 );
//Make sure this is TRUE at all times.
Editor/Editor Undo.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/EditorBuildings.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/EditorDefines.h
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR done
#include "BuildDefines.h"
#ifdef JA2EDITOR
Editor/EditorItems.cpp
-8
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR?
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -207,7 +206,6 @@ void EntryInitEditorItemsInfo()
}
}
// WANNE: EDITOR?
void InitEditorItemsInfo(UINT32 uiItemType)
{
VSURFACE_DESC vs_desc;
@@ -311,7 +309,6 @@ void InitEditorItemsInfo(UINT32 uiItemType)
//every pair of items (odd rounded up) requires 60 pixels for width.
//the minimum buffer size is 420. Height is always 80 pixels.
// WANNE: EDITOR?
eInfo.sWidth = (eInfo.sNumItems > 12) ? ((eInfo.sNumItems+1)/2)*60 : SCREEN_HEIGHT - 120;
eInfo.sHeight = 80;
// Create item buffer
@@ -377,7 +374,6 @@ void InitEditorItemsInfo(UINT32 uiItemType)
BltVideoObjectOutlineFromIndex( eInfo.uiBuffer, uiVideoObjectIndex, item->ubGraphicNum, sStart, y+2, 0, FALSE );
//cycle through the various slot positions (0,0), (0,40), (60,0), (60,40), (120,0)...
// WANNE: EDITOR?
if( y == 0 )
{
y = 40;
@@ -512,7 +508,6 @@ void InitEditorItemsInfo(UINT32 uiItemType)
}
}
// WANNE: EDITOR?
DisplayWrappedString(x, (UINT16)(y+25), 60, 2, SMALLCOMPFONT, FONT_WHITE, pStr, FONT_BLACK, TRUE, CENTER_JUSTIFIED );
//Calculate the center position of the graphic in a 60 pixel wide area.
@@ -525,7 +520,6 @@ void InitEditorItemsInfo(UINT32 uiItemType)
BltVideoObjectOutlineFromIndex( eInfo.uiBuffer, uiVideoObjectIndex, item->ubGraphicNum, sStart, y+2, 0, FALSE );
}
// WANNE: EDITOR?
//cycle through the various slot positions (0,0), (0,40), (60,0), (60,40), (120,0)...
if( y == 0 )
{
@@ -578,7 +572,6 @@ void RenderEditorItemsInfo()
return;
}
// WANNE: EDITOR?
if( gusMouseXPos < (iScreenWidthOffset + 110) || gusMouseXPos > (iScreenWidthOffset + 480) || gusMouseYPos < (2 * iScreenHeightOffset + 360) || gusMouseYPos > (2 * iScreenHeightOffset + 440) )
{ //Mouse has moved out of the items display region -- so nothing can be highlighted.
eInfo.sHilitedItemIndex = -1;
@@ -729,7 +722,6 @@ void HandleItemsPanel( UINT16 usScreenX, UINT16 usScreenY, INT8 bEvent )
//Add the converted mouse's XPos into a relative index;
//Calc: starting from 110, for every 60 pixels, add 2 to the index
// WANNE: EDITOR????
sIndex += ((usScreenX-110-iScreenWidthOffset)/60) * 2;
switch( bEvent )
{
Editor/EditorMapInfo.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/EditorMercs.cpp
-6
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -794,7 +793,6 @@ void DisplayEditMercWindow( void )
usFillColorLight = Get16BPPColor(FROMRGB(136, 138, 135));
usFillColorTextBk = Get16BPPColor(FROMRGB(250, 240, 188));
// WANNE: EDITOR?????????
iWidth = 266;
iHeight = 360;
iYPos = iScreenHeightOffset + 0;
@@ -1246,7 +1244,6 @@ void ShowEditMercColorSet( UINT8 ubPaletteRep, INT16 sSet )
sUnitSize = 128 / (INT16)(ubSize);
// WANNE: EDITOR?
sTop = 2 * iScreenHeightOffset + 364 + (sSet * 24);
sBottom = sTop + 20;
sLeft = iScreenWidthOffset + 230;
@@ -1334,7 +1331,6 @@ void DisplayWayPoints(void)
// Bring it down a touch
sScreenY += 5;
// WANNE: EDITOR?
if( sScreenY <= (2 * iScreenHeightOffset + 355 ))
{
// Shown it on screen!
@@ -1360,7 +1356,6 @@ void CreateEditMercWindow( void )
INT32 x;
SOLDIERTYPE *pSoldier;
// WANNE: EDITOR?
iWidth = 266;
iHeight = 360;
iYPos = iScreenHeightOffset + 0;
@@ -2795,7 +2790,6 @@ void AddNewItemToSelectedMercsInventory( BOOLEAN fCreate )
uiSrcID = guiMercTempBuffer;
uiDstID = guiMercInvPanelBuffers[ gbCurrSelect ];
// WANNE: EDITOR?
//build the rects
iDstWidth = gbCurrSelect < 3 ? MERCINV_SMSLOT_WIDTH : MERCINV_LGSLOT_WIDTH;
iDstHeight = MERCINV_SLOT_HEIGHT;
Editor/EditorTerrain.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/Item Statistics.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/LoadScreen.cpp
-2
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -458,7 +457,6 @@ void CreateFileDialog( STR16 zTitle )
//File list window
// WANNE: EDITOR?
iFileDlgButtons[4] = CreateHotSpot( (iScreenWidthOffset + 179+4), (iScreenHeightOffset + 69+3), (179+4+240), (69+120+3), MSYS_PRIORITY_HIGH-1, BUTTON_NO_CALLBACK, FDlgNamesCallback);
//Title button
iFileDlgButtons[5] = CreateTextButton(zTitle, HUGEFONT, FONT_LTKHAKI, FONT_DKKHAKI,
Editor/Road Smoothing.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/Sector Summary.cpp
-2
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -886,7 +885,6 @@ void RenderItemDetails()
{
xp += 170;
// WANNE: EDITOR?
yp = (iScreenHeightOffset + 20);
if( xp >= (UINT32)(iScreenWidthOffset + 300 ))
Editor/SmartMethod.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/Smoothing Utils.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/edit_sys.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDTIOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/editscreen.cpp
-10
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
@@ -779,7 +778,6 @@ BOOLEAN DrawTempMouseCursorObject(void)
}
// WANNE: EDITOR?
//Displays the current drawing object in the small, lower left window of the editor's toolbar.
void ShowCurrentDrawingMode( void )
{
@@ -798,7 +796,6 @@ void ShowCurrentDrawingMode( void )
UINT16 usFillColor;
INT32 iIndexToUse;
// WANNE: EDITOR?
// Set up a clipping rectangle for the display window.
NewRect.iLeft = iScreenWidthOffset + 0;
NewRect.iTop = 2 * iScreenHeightOffset + 400;
@@ -1007,7 +1004,6 @@ void ShowCurrentDrawingMode( void )
iPicWidth = (INT32)pETRLEObject->usWidth;
iPicHeight = (INT32)pETRLEObject->usHeight;
// WANNE: EDITOR?
// Center the picture in the display window.
iStartX = ( 100 - iPicWidth ) / 2;
iStartY = ( 60 - iPicHeight ) / 2;
@@ -1020,7 +1016,6 @@ void ShowCurrentDrawingMode( void )
pETRLEObject->sOffsetX = 0;
pETRLEObject->sOffsetY = 0;
// WANNE: EDITOR?
SetObjectShade( gTileDatabase[gTileTypeStartIndex[usObjIndex]].hTileSurface, DEFAULT_SHADE_LEVEL );
BltVideoObject( FRAME_BUFFER, gTileDatabase[gTileTypeStartIndex[usObjIndex]].hTileSurface,
usUseIndex, (iScreenWidthOffset + 0 + iStartX), (2 * iScreenHeightOffset + 400 + iStartY),
@@ -1030,7 +1025,6 @@ void ShowCurrentDrawingMode( void )
pETRLEObject->sOffsetY = sTempOffsetY;
}
// WANNE: EDITOR?
// Set the color for the window's border. Blueish color = Normal, Red = Fake lighting is turned on
usFillColor = GenericButtonFillColors[0];
pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES );
@@ -2401,7 +2395,6 @@ UINT32 WaitForHelpScreenResponse( void )
InputAtom DummyEvent;
BOOLEAN fLeaveScreen;
// WANNE: EDITOR?
ColorFillVideoSurfaceArea(FRAME_BUFFER, iScreenWidthOffset + 50, iScreenHeightOffset + 50, iScreenWidthOffset + 590, iScreenHeightOffset + 310,
Get16BPPColor(FROMRGB(136, 138, 135)) );
ColorFillVideoSurfaceArea(FRAME_BUFFER, iScreenWidthOffset + 51, iScreenHeightOffset + 51, iScreenWidthOffset + 590, iScreenHeightOffset + 310,
@@ -2617,7 +2610,6 @@ void ShowCurrentSlotSurface( UINT32 vSurface, INT32 iWindow )
INT32 iWinWidth, iWinHeight;
blt_vs_fx vSfx;
// WANNE: EDITOR
WinRect.iLeft = (iWindow == 0) ? (iScreenWidthOffset + 336) : (iScreenWidthOffset + 488);
WinRect.iTop = 2 * iScreenHeightOffset + 211;
WinRect.iRight = (iWindow == 0) ? (iScreenWidthOffset + 485) : (iScreenWidthOffset + 637);
@@ -2685,7 +2677,6 @@ void ShowCurrentSlotImage( HVOBJECT hVObj, INT32 iWindow )
ETRLEObject *pETRLEObject;
INT32 iWinWidth, iWinHeight;
// WANNE: EDITOR?
NewRect.iLeft = (iWindow == 0) ? (iScreenWidthOffset + 336) : (iScreenWidthOffset + 488);
NewRect.iTop = 2 * iScreenHeightOffset + 211;
NewRect.iRight = (iWindow == 0) ? (iScreenWidthOffset + 485) : (iScreenWidthOffset + 637);
@@ -3770,7 +3761,6 @@ UINT32 EditScreenHandle( void )
void CreateGotoGridNoUI()
{
// WANNE: EDITOR
gfGotoGridNoUI = TRUE;
//Disable the rest of the editor
DisableEditorTaskbar();
Editor/messagebox.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: done
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/newsmooth.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: todo
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else
Editor/smooth.cpp
-1
View File
@@ -1,4 +1,3 @@
// WANNE: EDITOR: no changes
#ifdef PRECOMPILEDHEADERS
#include "Editor All.h"
#else