1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +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
Laptop/BobbyRAmmo.cpp
-2
View File
@@ -62,7 +62,6 @@ void ExitBobbyRAmmo()
DeleteVideoObjectFromIndex(guiAmmoGrid);
DeleteBobbyMenuBar();
// WANNE
DeleteBobbyRAmmoFilter();
DeleteBobbyBrTitle();
@@ -92,7 +91,6 @@ void RenderBobbyRAmmo()
DisplayItemInfo(IC_AMMO, guiCurrentAmmoFilterMode);
UpdateButtonText(guiCurrentLaptopMode);
// WANNE
UpdateAmmoFilterButtons(guiCurrentAmmoFilterMode, guiPrevAmmoFilterMode);
MarkButtonsDirty( );
Laptop/BobbyRArmour.cpp
+1 -3
View File
@@ -23,7 +23,6 @@ void GameInitBobbyRArmour()
}
// WANNE
BOOLEAN EnterBobbyRArmour()
{
VOBJECT_DESC VObjectDesc;
@@ -47,7 +46,7 @@ BOOLEAN EnterBobbyRArmour()
//Draw menu bar
InitBobbyMenuBar( );
// WANNE
InitBobbyRArmourFilterBar();
RenderBobbyRArmour( );
@@ -61,7 +60,6 @@ void ExitBobbyRArmour()
DeleteVideoObjectFromIndex(guiArmourGrid);
DeleteBobbyMenuBar();
// WANNE
DeleteBobbyRArmourFilter();
DeleteBobbyBrTitle();
Laptop/BobbyRGuns.cpp
+2 -26
View File
@@ -136,7 +136,6 @@ BobbyRayPurchaseStruct BobbyRayPurchases[ MAX_PURCHASE_AMOUNT ];
//UINT8 usNumberOfBobbyRayOrderItems = 0;
//UINT8 usNumberOfBobbyRayOrderUsed = 0;
// WANNE
#define FILTER_BUTTONS_GUN_START_X BOBBYR_PREVIOUS_BUTTON_X
#define FILTER_BUTTONS_AMMO_START_X FILTER_BUTTONS_GUN_START_X
#define FILTER_BUTTONS_USED_START_X FILTER_BUTTONS_GUN_START_X //FILTER_BUTTONS_GUN_START_X + 122
@@ -144,7 +143,6 @@ BobbyRayPurchaseStruct BobbyRayPurchases[ MAX_PURCHASE_AMOUNT ];
#define FILTER_BUTTONS_MISC_START_X FILTER_BUTTONS_GUN_START_X
#define FILTER_BUTTONS_Y BOBBYR_PREVIOUS_BUTTON_Y + 25
// WANNE
// The number of filter buttons which category uses
#define NUMBER_GUNS_FILTER_BUTTONS 9
#define NUMBER_AMMO_FILTER_BUTTONS 8
@@ -152,25 +150,20 @@ BobbyRayPurchaseStruct BobbyRayPurchases[ MAX_PURCHASE_AMOUNT ];
#define NUMBER_MISC_FILTER_BUTTONS 9
#define NUMBER_USED_FILTER_BUTTONS 3
// WANNE
#define BOBBYR_GUNS_FILTER_BUTTON_GAP BOBBYR_CATALOGUE_BUTTON_GAP - 1
#define BOBBYR_AMMO_FILTER_BUTTON_GAP BOBBYR_CATALOGUE_BUTTON_GAP - 1
#define BOBBYR_USED_FILTER_BUTTON_GAP BOBBYR_CATALOGUE_BUTTON_GAP - 1
#define BOBBYR_ARMOUR_FILTER_BUTTON_GAP BOBBYR_CATALOGUE_BUTTON_GAP - 1
#define BOBBYR_MISC_FILTER_BUTTON_GAP BOBBYR_CATALOGUE_BUTTON_GAP - 1
// WANNE
UINT32 guiBobbyRFilterGuns[ NUMBER_GUNS_FILTER_BUTTONS ];
UINT32 guiBobbyRFilterAmmo[ NUMBER_AMMO_FILTER_BUTTONS ];
UINT32 guiBobbyRFilterArmor[ NUMBER_ARMOUR_FILTER_BUTTONS ];
UINT32 guiBobbyRFilterMisc[ NUMBER_MISC_FILTER_BUTTONS ];
UINT32 guiBobbyRFilterUsed[ NUMBER_USED_FILTER_BUTTONS ];
// WANNE
INT32 guiBobbyRFilterImage;
// WANNE
void BtnBobbyRFilterGunsCallback(GUI_BUTTON *btn,INT32 reason);
void BtnBobbyRFilterAmmoCallback(GUI_BUTTON *btn,INT32 reason);
void BtnBobbyRFilterUsedCallback(GUI_BUTTON *btn,INT32 reason);
@@ -179,7 +172,6 @@ void BtnBobbyRFilterMiscCallback(GUI_BUTTON *btn,INT32 reason);
BOOLEAN IsAmmoMatchinWeaponType(UINT16 usItemIndex, UINT8 ubWeaponType);
// WANNE
INT8 ubFilterGunsButtonValues[] = {
BOBBYR_FILTER_GUNS_HEAVY,
BOBBYR_FILTER_GUNS_PISTOL,
@@ -191,7 +183,6 @@ INT8 ubFilterGunsButtonValues[] = {
BOBBYR_FILTER_GUNS_LMG,
BOBBYR_FILTER_GUNS_SHOTGUN};
// WANNE
INT8 ubFilterAmmoButtonValues[] = {
BOBBYR_FILTER_AMMO_PISTOL,
BOBBYR_FILTER_AMMO_M_PISTOL,
@@ -326,7 +317,6 @@ void GameInitBobbyRGuns()
{
guiTempCurrentMode=0;
// WANNE
guiPrevGunFilterMode = -1;
guiPrevAmmoFilterMode = -1;
guiPrevUsedFilterMode = -1;
@@ -392,7 +382,6 @@ void ExitBobbyRGuns()
DeleteBobbyBrTitle();
DeleteBobbyMenuBar();
// WANNE
DeleteBobbyRGunsFilter();
DeleteMouseRegionForBigImage();
@@ -411,7 +400,7 @@ void RenderBobbyRGuns()
WebPageTileBackground(BOBBYR_NUM_HORIZONTAL_TILES, BOBBYR_NUM_VERTICAL_TILES, BOBBYR_BACKGROUND_WIDTH, BOBBYR_BACKGROUND_HEIGHT, guiGunBackground);
// WANNE
// WANNE: Do not display the title
//Display title at top of page
//DisplayBobbyRBrTitle();
@@ -497,7 +486,6 @@ void SelectTitleImageLinkRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
}
}
// WANNE
BOOLEAN InitBobbyRGunsFilterBar()
{
UINT8 i;
@@ -784,7 +772,6 @@ BOOLEAN InitBobbyMenuBar( )
return(TRUE);
}
// WANNE
BOOLEAN DeleteBobbyRGunsFilter()
{
UINT8 i;
@@ -841,7 +828,6 @@ BOOLEAN DeleteBobbyRArmourFilter()
return (TRUE);
}
// WANNE
BOOLEAN DeleteBobbyRMiscFilter()
{
UINT8 i;
@@ -880,7 +866,6 @@ BOOLEAN DeleteBobbyMenuBar()
return(TRUE);
}
// WANNE
void BtnBobbyRPageMenuCallback(GUI_BUTTON *btn,INT32 reason)
{
UINT32 bNewValue;
@@ -958,7 +943,6 @@ void BtnBobbyRPageMenuCallback(GUI_BUTTON *btn,INT32 reason)
}
// WANNE
void BtnBobbyRFilterGunsCallback(GUI_BUTTON *btn,INT32 reason)
{
UINT32 bNewValue;
@@ -1141,7 +1125,7 @@ void BtnBobbyRFilterUsedCallback(GUI_BUTTON *btn,INT32 reason)
}
}
// WANNE
void BtnBobbyRFilterArmourCallback(GUI_BUTTON *btn,INT32 reason)
{
UINT32 bNewValue;
@@ -1193,7 +1177,6 @@ void BtnBobbyRFilterArmourCallback(GUI_BUTTON *btn,INT32 reason)
}
}
// WANNE
void BtnBobbyRFilterMiscCallback(GUI_BUTTON *btn,INT32 reason)
{
UINT32 bNewValue;
@@ -1247,7 +1230,6 @@ void BtnBobbyRFilterMiscCallback(GUI_BUTTON *btn,INT32 reason)
SetFirstLastPagesForNew(IC_BOBBY_MISC, guiCurrentMiscFilterMode);
// WANNE: TODO
UpdateMiscFilterButtons();
DeleteMouseRegionForBigImage();
@@ -1305,7 +1287,6 @@ void BtnBobbyRNextPreviousPageCallback(GUI_BUTTON *btn,INT32 reason)
}
}
// WANNE
BOOLEAN DisplayItemInfo(UINT32 uiItemClass, INT32 iFilter)
{
UINT16 i;
@@ -2082,7 +2063,6 @@ void CalculateFirstAndLastIndexs()
}
*/
// WANNE: Filter
//Loops through Bobby Rays Inventory to find the first and last index
void SetFirstLastPagesForNew( UINT32 uiClassMask, INT32 iFilter )
{
@@ -2179,7 +2159,6 @@ void SetFirstLastPagesForNew( UINT32 uiClassMask, INT32 iFilter )
gubNumPages += 1;
}
// WANNE
//Loops through Bobby Rays Used Inventory to find the first and last index
void SetFirstLastPagesForUsed(INT32 iFilter)
{
@@ -2802,7 +2781,6 @@ void BtnBobbyRHomeButtonCallback(GUI_BUTTON *btn,INT32 reason)
}
// WANNE
void UpdateButtonText(UINT32 uiCurPage)
{
switch( uiCurPage )
@@ -2864,7 +2842,6 @@ void UpdateButtonText(UINT32 uiCurPage)
}
}
// WANNE
void UpdateAmmoFilterButtons(INT32 iNewButton, INT32 iOldButton)
{
if (iNewButton != iOldButton)
@@ -3064,7 +3041,6 @@ void DisableBobbyRButtons()
*/
}
// WANNE
void CalcFirstIndexForPage( STORE_INVENTORY *pInv, UINT32 uiItemClass )
{
UINT16 i;
Laptop/BobbyRMisc.cpp
+1 -5
View File
@@ -46,11 +46,9 @@ BOOLEAN EnterBobbyRMisc()
//Draw menu bar
InitBobbyMenuBar( );
// WANNE
InitBobbyRMiscFilterBar();
// CalculateFirstAndLastIndexs();
RenderBobbyRMisc( );
@@ -66,7 +64,6 @@ void ExitBobbyRMisc()
DeleteBobbyMenuBar();
// WANNE
DeleteBobbyRMiscFilter();
DeleteMouseRegionForBigImage();
@@ -91,7 +88,6 @@ void RenderBobbyRMisc()
GetVideoObject(&hPixHandle, guiMiscGrid);
BltVideoObject(FRAME_BUFFER, hPixHandle, 0, BOBBYR_GRIDLOC_X, BOBBYR_GRIDLOC_Y, VO_BLT_SRCTRANSPARENCY,NULL);
// WANNE
DisplayItemInfo(IC_BOBBY_MISC, guiCurrentMiscFilterMode);
UpdateButtonText(guiCurrentLaptopMode);
UpdateMiscFilterButtons();
Laptop/IMP Begin Screen.cpp
-18
View File
@@ -407,24 +407,6 @@ void BtnIMPBeginScreenDoneCallback(GUI_BUTTON *btn,INT32 reason)
}
}
// Check if we can create an imp with the selected gender
// WANNE NEW
/*if (bProceed == TRUE)
{
if( FEMALE_GENDER_SELECT == ubTextEnterMode )
{
bGenderFlag = IMP_FEMALE;
}
else if( MALE_GENDER_SELECT == ubTextEnterMode )
{
bGenderFlag = IMP_MALE;
}
else
{
bProceed = FALSE;
}
}*/
// Data is valid
if (bProceed == TRUE)
{
Laptop/IMP Confirm.cpp
-1
View File
@@ -227,7 +227,6 @@ BOOLEAN AddCharacterToPlayersTeam( void )
memset(&HireMercStruct, 0, sizeof(MERC_HIRE_STRUCT));
// WANNE NEW: Any changes here. I don't think so
HireMercStruct.ubProfileID = ( UINT8 )( LaptopSaveInfo.iIMPIndex ) ;
if( fLoadingCharacterForPreviousImpProfile == FALSE )
Laptop/IMP HomePage.cpp
+1 -1
View File
@@ -347,7 +347,7 @@ void HandleTextEvent( UINT32 uiKey )
if( uiKey >= 'A' && uiKey <= 'Z' ||
uiKey >= 'a' && uiKey <= 'z' ||
uiKey >= '0' && uiKey <= '9' ||
uiKey == '_' || uiKey == '.' || uiKey ==' ') // WANNE NEW: added ' '
uiKey == '_' || uiKey == '.' || uiKey ==' ')
{
// if the current string position is at max or great, do nothing
if( iStringPos >= 8 )
Laptop/IMP MainPage.cpp
-2
View File
@@ -980,7 +980,6 @@ void IMPMainPageNotSelectableBtnCallback(MOUSE_REGION * pRegion, INT32 iReason )
return;
}
// WANNE NEW
// WDS: Allow flexible numbers of IMPs of each sex
INT32 CountFilledIMPSlots( INT8 iSex )
{
@@ -1049,7 +1048,6 @@ INT32 GetSexOfIMP(INT32 iIMPId)
}
// WANNE NEW
INT32 GetFreeIMPSlot(INT32 iIMPId, INT32 iDefaultIMPId)
{
INT32 iStart;
Laptop/IMP MainPage.h
-1
View File
@@ -10,7 +10,6 @@ void NextProfilingMode( void );
void ShadeUnSelectableButtons( void );
BOOLEAN IsIMPSlotFree(INT32 iIMPId);
// WANNE NEW
INT32 GetFreeIMPSlot(INT32 iIMPId, INT32 iDefaultIMPId);
// WDS: Allow flexible numbers of IMPs of each sex
Laptop/IMP Voices.cpp
-2
View File
@@ -165,7 +165,6 @@ void FixVoiceRange()
}
// WANNE NEW
void IncrementVoice( void )
{
INT32 iIMPIndex = -1;
@@ -413,7 +412,6 @@ void BtnIMPVoicesDoneCallback(GUI_BUTTON *btn,INT32 reason)
*/
// set voice id, to grab character slot
// WANNE 10:
// WDS: Allow flexible numbers of IMPs of each sex
LaptopSaveInfo.iIMPIndex = gGameExternalOptions.iaIMPSlots[iCurrentVoice];
Laptop/email.cpp
-4
View File
@@ -239,7 +239,6 @@ UINT32 guiEmailIndicator;
UINT32 guiEmailMessage;
UINT32 guiMAILDIVIDER;
// WANNE 10:
INT16 giCurrentIMPSlot = PLAYER_GENERATED_CHARACTER_ID;
@@ -800,7 +799,6 @@ void AddEmailMessage(INT32 iMessageOffset, INT32 iMessageLength,STR16 pSubject,
// null out last byte of subject
pTempEmail->pSubject[wcslen(pSubject)+1]=0;
// WANNE 10:
pTempEmail->iCurrentIMPPosition = iCurrentIMPPosition;
// set date and sender, Id
@@ -1740,7 +1738,6 @@ INT32 DisplayEmailMessage(EmailPtr pMail)
// we KNOW the player is going to "read" this, so mark it as so
pMail->fRead=TRUE;
// WANNE 10
giCurrentIMPSlot = pMail->iCurrentIMPPosition;
// draw text for title bar
@@ -3475,7 +3472,6 @@ void HandleIMPCharProfileResultsMessage( void)
}
// personality itself
// WANNE 10:
switch( gMercProfiles[ iCurrentIMPSlot ].bAttitude )
{
// normal as can be
Laptop/email.h
-2
View File
@@ -194,8 +194,6 @@ typedef struct
BOOLEAN fRead;
BOOLEAN fNew;
// WANNE - SAVEGAME-STRUCTURE: Remove the comment, until we have bigger changes in the savegame structure
// BECAUSE A NEW GAME MUST BE STARTED!
INT32 iCurrentIMPPosition;
} SavedEmailStruct;
Laptop/laptop.cpp
+5 -17
View File
@@ -1,4 +1,3 @@
// WANNE 2 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Laptop All.h"
#include "HelpScreen.h"
@@ -272,7 +271,6 @@ extern BOOLEAN fFirstTimeInGameScreen;
#define LAPTOP__NEW_EMAIL_ICON_X iScreenWidthOffset + 67
#define LAPTOP__NEW_EMAIL_ICON_Y LAPTOP__NEW_FILE_ICON_Y
// WANNE
INT32 guiCurrentGunFilterMode;
INT32 guiPrevGunFilterMode;
@@ -375,8 +373,6 @@ static BOOLEAN fNewWWW=TRUE;
//Used to store the site to go to after the 'rain delay' message
extern UINT32 guiRainLoop;
// WANNE 2
INT32 giRainDelayInternetSite=-1;
@@ -877,7 +873,7 @@ INT32 EnterLaptop()
// Stop ambients...
StopAmbients( );
// WANNE 2: disabled rain sound when laptop is displayed
// WANNE: disabled rain sound when laptop is displayed
////if its raining, start the rain showers
//if( IsItRaining() )
//{
@@ -1041,7 +1037,7 @@ void ExitLaptop()
// Start ambients...
BuildDayAmbientSounds( );
// WANNE 2: disabled rain sound when laptop is displayed
// WANNE: disabled rain sound when laptop is displayed
//if its raining, start the rain showers
//if( IsItRaining() )
//{
@@ -1813,7 +1809,6 @@ void HandleLapTopHandles()
extern BOOLEAN gfPrintFrameBuffer;
// WANNE 2 <change laptop zooming>
UINT32 LaptopScreenHandle()
{
INT16 sYOffset = 0;
@@ -1884,7 +1879,7 @@ UINT32 LaptopScreenHandle()
DstRect.iRight = iScreenWidthOffset + 640; //640
DstRect.iBottom = iScreenHeightOffset + 480; //480
iLaptopMonitorCenterX = SCREEN_WIDTH - 184 + 19 + sXOffset;
iLaptopMonitorCenterY = SCREEN_HEIGHT - 70 + 16 + sYOffset; // WANNE 2
iLaptopMonitorCenterY = SCREEN_HEIGHT - 70 + 16 + sYOffset;
uiTimeRange = 1000;
iPercentage = iRealPercentage = 0;
uiStartTime = GetJA2Clock();
@@ -1897,7 +1892,6 @@ UINT32 LaptopScreenHandle()
PlayJA2SampleFromFile( "SOUNDS\\Laptop power up (8-11).wav", RATE_11025, HIGHVOLUME, 1, MIDDLEPAN );
// WANNE 2 with laptop zooming
while( iRealPercentage < 100 )
{
// Lesh: restore mapscreen so laptop zooming won't leave "graphical trail
@@ -1935,10 +1929,8 @@ UINT32 LaptopScreenHandle()
BltStretchVideoSurface( FRAME_BUFFER, guiSAVEBUFFER, iScreenWidthOffset, iScreenHeightOffset, 0, &DstRect, &SrcRect2 );
//WANNE 2
InvalidateScreen();
//WANNE 2
RefreshScreen( NULL );
}
@@ -2010,7 +2002,6 @@ UINT32 LaptopScreenHandle()
fPausedReDrawScreenFlag = FALSE;
}
// WANNE 2 <redraw>
if( fReDrawScreenFlag )
{
RenderLapTopImage();
@@ -2139,7 +2130,6 @@ UINT32 LaptopScreenHandle()
// render frame rate
DisplayFrameRate( );
// WANNE 2 <redraw>
// invalidate screen if redrawn
if( fReDrawScreenFlag == TRUE )
{
@@ -2550,7 +2540,6 @@ BOOLEAN LeaveLapTopScreen( void )
PlayJA2SampleFromFile( "SOUNDS\\Laptop power down (8-11).wav", RATE_11025, HIGHVOLUME, 1, MIDDLEPAN );
// WANNE 2
while( iRealPercentage > 0 )
{
BlitBufferToBuffer( guiEXTRABUFFER, FRAME_BUFFER, iScreenWidthOffset, iScreenHeightOffset,
@@ -3633,7 +3622,7 @@ void BookmarkCallBack(MOUSE_REGION * pRegion, INT32 iReason )
void GoToWebPage(INT32 iPageId )
{
// WANNE 2: disabled rain sound when laptop is displayed
// WANNE: disabled rain sound when laptop is displayed
////if it is raining, popup a warning first saying connection time may be slow
//if( IsItRaining() )
//{
@@ -5288,7 +5277,7 @@ BOOLEAN DrawDeskTopBackground( void )
SGPRect clip;
// set clipping region
// WANNE (if i change this values to SCREEN_WIDTH, ... than an exception is thrown in the vobject_blitters.cpp)
// WANNE: If i change this values to SCREEN_WIDTH, ... than an exception is thrown in the vobject_blitters.cpp)
// -> no changes to clip structure
clip.iLeft = 0;
clip.iRight = 506;
@@ -6422,7 +6411,6 @@ BOOLEAN IsItRaining()
void InternetRainDelayMessageBoxCallBack( UINT8 bExitValue )
{
// WANNE 2
//GoToWebPage( giRainDelayInternetSite );
//Set to -2 so we dont due the message for this occurence of laptop
Laptop/mercs Account.cpp
-6
View File
@@ -1,4 +1,3 @@
// WANNE 3 <changed some lines>
#ifdef PRECOMPILEDHEADERS
#include "Laptop All.h"
#else
@@ -179,7 +178,6 @@ void BtnAccountNextPageButtonCallback(GUI_BUTTON *btn,INT32 reason)
}
}
// WANNE 3
INT32 GetNumberOfHiredMercs()
{
UINT8 usMercID;
@@ -217,7 +215,6 @@ void GameInitMercsAccount()
BOOLEAN EnterMercsAccount()
{
// WANNE 3 - BEGIN
UINT8 mercOverPage = 0;
iCurrentAccountPage = 0;
@@ -234,7 +231,6 @@ BOOLEAN EnterMercsAccount()
if (iTotalAccountPages == 0)
iTotalAccountPages++;
// WANNE 3 - END
VOBJECT_DESC VObjectDesc;
@@ -743,8 +739,6 @@ UINT32 CalculateHowMuchPlayerOwesSpeck()
UINT32 uiContractCharge=0;
UINT16 usMercID;
// WANNE 2
for(i=0; i<TOTAL_NUMBER_OF_MERCS; i++)
{
//if it larry Roach burn advance. ( cause larry is in twice, a sober larry and a stoned larry )