dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-04-25 04:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make rvGEWindowWrapper (for GUI editor) 64bit clean

Browse source 
it wants to store a pointer to itself in an idWinVar - on 32bit idWinInt
was suitable for that, on 64bit it's not, so instead convert the pointer
to a hex-string and stuff it in a idWinStr

also fix a crash when adding a choiceDef in the gui editor
This commit is contained in:
Daniel Gibson 2021-05-08 06:42:25 +02:00
parent e1c9e7a351
commit 5f137955ac
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
neo/tools/guied/GEWindowWrapper.cpp
View file

@ -68,11 +68,21 @@ rvGEWindowWrapper::rvGEWindowWrapper( idWindow *window,EWindowType type ) {
}
// Attach the wrapper to the window by adding a defined variable
// with the wrappers pointer stuffed into an integer
// FIXME: WTF is this about?!
// with the wrappers pointer stuffed into (an integer) - actually a string now
#if 0
idWinInt *var = new idWinInt();
int x = (int)this;
*var = x;
#else // DG: use idWinStr, because idWinInt can't cold 64bit pointers
idWinStr* var = new idWinStr();
// convert this to hex-string (*without* "0x" prefix)
const ULONG_PTR thisULP = (ULONG_PTR)this;
char buf[32] = {0};
_ui64toa(thisULP, buf, 16);
var->Set(buf);
#endif
var->SetEval(false);
var->SetName("guied_wrapper");
mWindow->AddDefinedVar(var);
@ -88,10 +98,19 @@ Static method that returns the window wrapper for the given window class
================
*/
rvGEWindowWrapper * rvGEWindowWrapper::GetWrapper( idWindow *window ) {
#if 0
idWinInt *var;
var = dynamic_cast< idWinInt*>(window->GetWinVarByName("guied_wrapper"));
return var ? ((rvGEWindowWrapper *) (int) (*var)) : NULL;
// FIXME: this won't work!
return var ? ((rvGEWindowWrapper *)(int) (*var)) : NULL;
#else
// DG: use idWinStr, because idWinInt can't cold 64bit pointers
idWinStr* var = (idWinStr*)window->GetWinVarByName("guied_wrapper");
if(var == NULL)
return NULL;
ULONG_PTR thisULP = (ULONG_PTR)_strtoui64(var->c_str(), NULL, 16);
return (rvGEWindowWrapper *)thisULP;
#endif
}
/*

4
neo/ui/ChoiceWindow.cpp
View file

@ -440,7 +440,9 @@ void idChoiceWindow::Draw(int time, float x, float y) {
color = hoverColor;
}
dc->DrawText( choices[currentChoice], textScale, textAlign, color, textRect, false, -1 );
if(choices.Num() > 0) {
dc->DrawText( choices[currentChoice], textScale, textAlign, color, textRect, false, -1 );
}
}
void idChoiceWindow::Activate( bool activate, idStr &act ) {