Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove old wzscript debugging watch window. Add new debug hotkey to test 

temporary map reveal ability (by default shift+w).
master
per 2013-05-18 14:25:46 +02:00
parent 23da1f1891
commit 7901595c07
7 changed files with 11 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/keybind.cpp
View File

@ -835,11 +835,9 @@ void kf_ToggleCamera( void )
camToggleStatus();
}
/* Toggle 'watch' window on/off */
void kf_ToggleWatchWindow( void )
void kf_RevealMapAtPos()
{
addConsoleMessage("WATCH WINDOW!", LEFT_JUSTIFY, SYSTEM_MESSAGE); // what is this? - per
(void)addDebugMenu(!DebugMenuUp);
addSpotter(mouseTileX, mouseTileY, selectedPlayer, 1024, 0, gameTime + 2000);
}
// --------------------------------------------------------------------------

2
src/keybind.h
View File

@ -250,7 +250,7 @@ void kf_TileInfo(void);
void kf_NoAssert(void);
extern void kf_ToggleWatchWindow( void );
void kf_RevealMapAtPos();
bool runningMultiplayer(void);

4
src/keymap.cpp
View File

@ -248,7 +248,7 @@ _keymapsave keyMapSaveTable[] =
kf_TriFlip,
kf_NOOP, // unused
kf_NOOP, // unused
kf_ToggleWatchWindow,
kf_RevealMapAtPos,
kf_ToggleDrivingMode,
kf_ToggleShowGateways,
kf_ToggleShowPath,
@ -475,7 +475,7 @@ void keyInitMappings( bool bForceDefaults )
keyAddMapping(KEYMAP__DEBUG, KEY_LCTRL, KEY_G, KEYMAP_PRESSED, kf_ToggleGodMode, N_("Toggle god Mode Status"));
keyAddMapping(KEYMAP__DEBUG, KEY_LCTRL, KEY_O, KEYMAP_PRESSED, kf_ChooseOptions, N_("Display Options Screen"));
keyAddMapping(KEYMAP__DEBUG, KEY_LCTRL, KEY_X, KEYMAP_PRESSED, kf_FinishResearch, N_("Complete current research"));
keyAddMapping(KEYMAP__DEBUG, KEY_LSHIFT, KEY_W, KEYMAP_PRESSED, kf_ToggleWatchWindow, N_("Toggle watch window"));
keyAddMapping(KEYMAP__DEBUG, KEY_LSHIFT, KEY_W, KEYMAP_PRESSED, kf_RevealMapAtPos, N_("Reveal map at mouse position"));
keyAddMapping(KEYMAP__DEBUG, KEY_LCTRL, KEY_L, KEYMAP_PRESSED, kf_TraceObject, N_("Trace a game object"));
keyAddMapping(KEYMAP__DEBUG, KEY_LSHIFT, KEY_D, KEYMAP_PRESSED, kf_ToggleDrivingMode, N_("Toggle Driving Mode"));
saveKeyMap(); // save out the default key mappings.

134
src/multimenu.cpp
View File

@ -70,17 +70,10 @@ W_SCREEN *psRScreen; // requester stuff.
extern char MultiCustomMapsPath[PATH_MAX];
bool MultiMenuUp = false;
bool DebugMenuUp = false;
static UDWORD context = 0;
UDWORD current_tech = 1;
UDWORD current_numplayers = 4;
#define DEBUGMENU_FORM_W 200
#define DEBUGMENU_FORM_X (screenWidth - DEBUGMENU_FORM_W) //pie_GetVideoBufferWidth() ?
#define DEBUGMENU_FORM_Y 110 + D_H
#define DEBUGMENU_ENTRY_H 20
#define MULTIMENU_FORM_X 10 + D_W
#define MULTIMENU_FORM_Y 23 + D_H
#define MULTIMENU_FORM_W 620
@ -154,8 +147,6 @@ bool multiRequestUp = false; //multimenu is up.
static unsigned hoverPreviewId;
static bool giftsUp[MAX_PLAYERS] = {true}; //gift buttons for player are up.
char debugMenuEntry[DEBUGMENU_MAX_ENTRIES][MAX_STR_LENGTH];
// ////////////////////////////////////////////////////////////////////////////
// Map / force / name load save stuff.
@ -846,24 +837,6 @@ static void displayMultiPlayer(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset)
}
}
static void displayDebugMenu(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset)
{
char str[128];
int x = xOffset + psWidget->x();
int y = yOffset + psWidget->y();
UDWORD index = psWidget->UserData;
iV_SetFont(font_regular); // font
iV_SetTextColour(WZCOL_TEXT_BRIGHT);
if(strcmp(debugMenuEntry[index],""))
{
sprintf(str,"%s", debugMenuEntry[index]);
iV_DrawText(str, x, y+MULTIMENU_FONT_OSET);
}
}
// ////////////////////////////////////////////////////////////////////////////
// alliance display funcs
@ -1015,113 +988,6 @@ static void addMultiPlayer(UDWORD player,UDWORD pos)
}
}
/* Output some text to the debug menu */
void setDebugMenuEntry(char *entry, SDWORD index)
{
bool bAddingNew = false;
/* New one? */
if(!strcmp(debugMenuEntry[index],""))
{
bAddingNew = true;
}
/* Set */
strcpy(debugMenuEntry[index], entry);
/* Re-open it if already open to recalculate height */
if(DebugMenuUp && bAddingNew)
{
intCloseDebugMenuNoAnim();
(void)addDebugMenu(true);
}
}
void intCloseDebugMenuNoAnim(void)
{
//widgDelete(psWScreen, DEBUGMENU_CLOSE);
widgDelete(psWScreen, DEBUGMENU);
DebugMenuUp = false;
//intMode = INT_NORMAL;
}
/* Opens/closes a 'watch' window (Default key combo: Alt+Space),
* only available in debug mode
*/
bool addDebugMenu(bool bAdd)
{
UDWORD i,pos = 0,formHeight=0;
/* Close */
if(!bAdd) //|| widgGetFromID(psWScreen,DEBUGMENU)
{
intCloseDebugMenuNoAnim();
return true;
}
intResetScreen(false);
// calculate required height.
formHeight = 12; //DEBUGMENU_ENTRY_H
for(i=0;i<DEBUGMENU_MAX_ENTRIES;i++)
{
if(strcmp(debugMenuEntry[i],""))
formHeight += DEBUGMENU_ENTRY_H;
}
WIDGET *parent = psWScreen->psForm;
// add form
IntFormAnimated *debugMenu = new IntFormAnimated(parent);
debugMenu->id = DEBUGMENU;
debugMenu->setGeometry(DEBUGMENU_FORM_X, DEBUGMENU_FORM_Y, DEBUGMENU_FORM_W, formHeight);
// add debug info
pos = 0;
for(i=0;i<DEBUGMENU_MAX_ENTRIES;i++)
{
if(strcmp(debugMenuEntry[i],""))
{
// add form
W_FORMINIT sFormInit;
sFormInit.formID = DEBUGMENU;
sFormInit.id = DEBUGMENU_CLOSE + pos + 1;
sFormInit.style = WFORM_PLAIN;
sFormInit.x = 5;
sFormInit.y = 5 + DEBUGMENU_ENTRY_H * pos;
sFormInit.width = DEBUGMENU_FORM_W;
sFormInit.height = DEBUGMENU_ENTRY_H;
sFormInit.pDisplay = displayDebugMenu;
sFormInit.UserData = i;
widgAddForm(psWScreen, &sFormInit);
pos++;
}
}
// Add the close button.
/*
sButInit.formID = DEBUGMENU;
sButInit.id = DEBUGMENU_CLOSE;
sButInit.style = WBUT_PLAIN;
sButInit.x = DEBUGMENU_FORM_W - CLOSE_WIDTH;
sButInit.y = 0;
sButInit.width = CLOSE_WIDTH;
sButInit.height = CLOSE_HEIGHT;
sButInit.pTip = _("Close");
sButInit.FontID = font_regular;
sButInit.pDisplay = intDisplayImageHilight;
sButInit.pUserData = (void*)PACKDWORD_TRI(0,IMAGE_CLOSEHILIGHT , IMAGE_CLOSE);
if (!widgAddButton(psWScreen, &sButInit))
{
return false;
} */
DebugMenuUp = true;
return true;
}
bool intAddMultiMenu(void)
{
UDWORD i;

12
src/multimenu.h
View File

@ -41,24 +41,12 @@ extern bool intCloseMultiMenu (void);
extern void intCloseMultiMenuNoAnim (void);
extern bool intAddMultiMenu (void);
extern bool addDebugMenu (bool bAdd);
extern void intCloseDebugMenuNoAnim (void);
extern void setDebugMenuEntry(char *entry, SDWORD index);
extern bool MultiMenuUp;
extern bool DebugMenuUp;
extern UDWORD current_numplayers;
extern UDWORD current_tech;
#define MULTIMENU 10600
#define MULTIMENU_FORM MULTIMENU
#define DEBUGMENU 106000
#define DEBUGMENU_CLOSE (DEBUGMENU+1)
#define DEBUGMENU_MAX_ENTRIES 10
extern char debugMenuEntry[DEBUGMENU_MAX_ENTRIES][MAX_STR_LENGTH];
#endif // __INCLUDED_SRC_MULTIMENU__

30
src/scriptfuncs.cpp
View File

@ -9870,35 +9870,17 @@ bool scrLog(void)
return true;
}
/* Show/Hide multiplayer debug menu */
bool scrDebugMenu(void)
bool scrDebugMenu() // no-op
{
int32_t menuUp; // was SDWORD which happens to be int32_t, but is being used as a VAL_BOOL, so : ** see warning about conversion
if (!stackPopParams(1, VAL_BOOL, &menuUp))
{
debug(LOG_ERROR, "scrDebugMenu(): stack failed");
return false;
}
(void)addDebugMenu(menuUp);
int32_t menuUp;
stackPopParams(1, VAL_BOOL, &menuUp);
return true;
}
/* Set debug menu output string */
bool scrSetDebugMenuEntry(void)
bool scrSetDebugMenuEntry() // no-op
{
SDWORD index;
if (!stackPopParams(2, VAL_STRING, &strParam1, VAL_INT, &index))
{
debug(LOG_ERROR, "scrSetDebugMenuEntry(): stack failed");
return false;
}
setDebugMenuEntry(strParam1, index);
int index;
stackPopParams(2, VAL_STRING, &strParam1, VAL_INT, &index);
return true;
}

6
src/scripttabs.cpp
View File

@ -2231,8 +2231,6 @@ TYPE_EQUIV asEquivTable[] =
// Initialise the script system
bool scrTabInitialise(void)
{
unsigned int i;
if (!scriptInitialise())
{
return false;
@ -2317,10 +2315,6 @@ bool scrTabInitialise(void)
scrGameLevel = 0;
bInTutorial = false;
/* Initialize debug output */
for(i=0; i<DEBUGMENU_MAX_ENTRIES; i++)
debugMenuEntry[i][0] = '\0';
/* Initialize chat message struct */
chat_msg.numCommands = 0;
strcpy(chat_msg.lastMessage, "");