1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix code that relies on transitive includes

Browse Source
This commit is contained in:
Marco Antonio J. Costa
2025-08-30 19:09:06 -03:00
committed by majcosta
parent 272ba56fa1
commit 5d3cc7969f
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Multiplayer/connect.h
+1
View File
@@ -6,6 +6,7 @@
#include "Event Pump.h" #include "Event Pump.h"
#include "Bullets.h" #include "Bullets.h"
#include "builddefines.h" #include "builddefines.h"
#include "Strategic Movement.h"
extern bool isOwnTeamWipedOut; extern bool isOwnTeamWipedOut;
Utils/popup_class.cpp
+8 -8
View File
@@ -21,8 +21,8 @@
// functions and variable declarations for binding the class with C callbacks // functions and variable declarations for binding the class with C callbacks
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
vector<PopupIndex> gPopupRegionIndex; std::vector<PopupIndex> gPopupRegionIndex;
vector<POPUP*> gPopupIndex; std::vector<POPUP*> gPopupIndex;
UINT32 gPopupRegionIndexCounter = 0; UINT32 gPopupRegionIndexCounter = 0;
UINT32 gPopupIndexCounter = 0; UINT32 gPopupIndexCounter = 0;
UINT32 POPUP::nextid = 0; UINT32 POPUP::nextid = 0;
@@ -237,19 +237,19 @@ BOOLEAN POPUP_OPTION::forceRun()
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
// constructor // constructor
POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(void) : POPUP_OPTION(new wstring(L"Unnamed subPopup"),NULL) //TODO: possible memmory leak! POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(void) : POPUP_OPTION(new std::wstring(L"Unnamed subPopup"),NULL) //TODO: possible memmory leak!
{ {
this->parent = NULL; this->parent = NULL;
this->initSubPopup(); this->initSubPopup();
} }
POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(wstring* name) : POPUP_OPTION(name, NULL) POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(std::wstring* name) : POPUP_OPTION(name, NULL)
{ {
this->parent = NULL; this->parent = NULL;
this->initSubPopup(); this->initSubPopup();
} }
POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(wstring* newName, const POPUP * parent) : POPUP_OPTION(newName, NULL) POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(std::wstring* newName, const POPUP * parent) : POPUP_OPTION(newName, NULL)
{ {
this->parent = parent; this->parent = parent;
this->initSubPopup(); this->initSubPopup();
@@ -342,7 +342,7 @@ static void unShadeOpenSubPopup( POPUP_SUB_POPUP_OPTION * opt ){
void POPUP_SUB_POPUP_OPTION::initSubPopup() void POPUP_SUB_POPUP_OPTION::initSubPopup()
{ {
this->subPopup = new POPUP( (CHAR*) wstring(this->name).c_str() ); this->subPopup = new POPUP( (CHAR*) std::wstring(this->name).c_str() );
this->subPopup->setCallback(POPUP_CALLBACK_SHOW,new popupCallbackFunction<void,POPUP_SUB_POPUP_OPTION*>( &shadeOpenSubPopup, this )); this->subPopup->setCallback(POPUP_CALLBACK_SHOW,new popupCallbackFunction<void,POPUP_SUB_POPUP_OPTION*>( &shadeOpenSubPopup, this ));
this->subPopup->setCallback(POPUP_CALLBACK_HIDE,new popupCallbackFunction<void,POPUP_SUB_POPUP_OPTION*>( &unShadeOpenSubPopup, this )); this->subPopup->setCallback(POPUP_CALLBACK_HIDE,new popupCallbackFunction<void,POPUP_SUB_POPUP_OPTION*>( &unShadeOpenSubPopup, this ));
@@ -563,7 +563,7 @@ void POPUP::setInitialValues(void)
// setup functions // setup functions
POPUP_OPTION * POPUP::addOption(wstring * name, popupCallback* action) POPUP_OPTION * POPUP::addOption(std::wstring * name, popupCallback* action)
{ {
if (this->optionCount < POPUP_MAX_OPTIONS) if (this->optionCount < POPUP_MAX_OPTIONS)
{ {
@@ -606,7 +606,7 @@ POPUP_OPTION * POPUP::getOption(UINT16 n)
return NULL; return NULL;
} }
POPUP * POPUP::addSubMenuOption(wstring * name) POPUP * POPUP::addSubMenuOption(std::wstring * name)
{ {
if (this->subPopupOptionCount < POPUP_MAX_SUB_POPUPS) if (this->subPopupOptionCount < POPUP_MAX_SUB_POPUPS)
{ {