Skip to content

fix code that relies on transitive includes #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
majcosta merged 1 commit into from
Aug 30, 2025
Merged

fix code that relies on transitive includes #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Multiplayer/connect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "Event Pump.h"
#include "Bullets.h"
#include "builddefines.h"
#include "Strategic Movement.h"

extern bool isOwnTeamWipedOut;

Expand Down
16 changes: 8 additions & 8 deletions Utils/popup_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
// functions and variable declarations for binding the class with C callbacks
//////////////////////////////////////////////////////////////////

vector<PopupIndex> gPopupRegionIndex;
vector<POPUP*> gPopupIndex;
std::vector<PopupIndex> gPopupRegionIndex;
std::vector<POPUP*> gPopupIndex;
UINT32 gPopupRegionIndexCounter = 0;
UINT32 gPopupIndexCounter = 0;
UINT32 POPUP::nextid = 0;
Expand Down Expand Up @@ -237,19 +237,19 @@ BOOLEAN POPUP_OPTION::forceRun()
//////////////////////////////////////////////////////////////////

// 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->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->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->initSubPopup();
Expand Down Expand Up @@ -342,7 +342,7 @@ static void unShadeOpenSubPopup( POPUP_SUB_POPUP_OPTION * opt ){

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_HIDE,new popupCallbackFunction<void,POPUP_SUB_POPUP_OPTION*>( &unShadeOpenSubPopup, this ));

Expand Down Expand Up @@ -563,7 +563,7 @@ void POPUP::setInitialValues(void)

// 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)
{
Expand Down Expand Up @@ -606,7 +606,7 @@ POPUP_OPTION * POPUP::getOption(UINT16 n)
return NULL;
}

POPUP * POPUP::addSubMenuOption(wstring * name)
POPUP * POPUP::addSubMenuOption(std::wstring * name)
{
if (this->subPopupOptionCount < POPUP_MAX_SUB_POPUPS)
{
Expand Down