OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- reworked CVARs to not use a linked list and to be initialized manually.

Browse source 
This solves two problems:

* The linked list is too slow, a map is better. A map cannot be used with statically allocated CVARs because order of initialization is undefined.
* The current CVAR system is an unordered mishmash of static variables and dynamically allocated ones and the means of identification are unsafe. With this everything is allocated on the heap so it can all be handled the same by the cleanup code.
This commit is contained in:
Christoph Oelckers 2022-10-21 18:28:28 +02:00
commit 453688ccc6
28 changed files with 369 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/am_map.cpp
View file

@ -421,11 +421,11 @@ struct AMColorset
bool forcebackground;
bool defined; // only for mod specific colorsets: must be true to be usable
void initFromCVars(FColorCVar **values)
void initFromCVars(FColorCVarRef **values)
{
for(int i=0;i<AlmostBackgroundColor; i++)
{
c[i].FromCVar(*values[i]);
c[i].FromCVar(*(values[i]->get()));
}
uint32_t ba = *(values[0]);
@ -513,7 +513,7 @@ static const int AUTOMAP_LINE_COLORS[AMLS_COUNT] =
//
//=============================================================================
static FColorCVar *cv_standard[] = {
static FColorCVarRef *cv_standard[] = {
&am_backcolor,
&am_yourcolor,
&am_wallcolor,
@ -540,7 +540,7 @@ static FColorCVar *cv_standard[] = {
&am_portalcolor
};
static FColorCVar *cv_overlay[] = {
static FColorCVarRef *cv_overlay[] = {
&am_backcolor, // this will not be used in overlay mode
&am_ovyourcolor,
&am_ovwallcolor,
@ -571,11 +571,11 @@ CCMD(am_restorecolors)
{
for (unsigned i = 0; i < countof(cv_standard); i++)
{
cv_standard[i]->ResetToDefault();
cv_standard[i]->get()->ResetToDefault();
}
for (unsigned i = 0; i < countof(cv_overlay); i++)
{
cv_overlay[i]->ResetToDefault();
cv_overlay[i]->get()->ResetToDefault();
}
}