Fixed struct order

This commit is contained in:
Joelrau 2021-01-03 07:26:51 +02:00
parent b75a77b351
commit d746af4c11
2 changed files with 33 additions and 29 deletions

View File

@ -76,10 +76,10 @@ namespace game_console
printf("%s\n", data.data()); printf("%s\n", data.data());
if (con.output.size() > 1024) //if (con.output.size() > 512)
{ //{
con.output.pop_front(); // con.output.pop_front();
} //}
} }
void toggle_console() void toggle_console()
@ -662,6 +662,10 @@ namespace game_console
va_end(args); va_end(args);
std::cout << buffer; std::cout << buffer;
con.output.push_back(buffer); con.output.push_back(buffer);
if (con.output.size() > 512)
{
con.output.pop_front();
}
return result; return result;
} }

View File

@ -782,6 +782,31 @@ namespace game
ASSET_TYPE_COUNT = 0x44, ASSET_TYPE_COUNT = 0x44,
}; };
enum GfxDrawSceneMethod
{
GFX_DRAW_SCENE_STANDARD = 0x0,
};
enum MaterialTechniqueType
{
TECHNIQUE_UNLIT = 8,
TECHNIQUE_EMISSIVE = 9,
TECHNIQUE_LIT = 13,
};
struct GfxDrawMethod_s
{
int drawScene;
int baseTechType;
int emissiveTechType;
int forceTechType;
};
struct Material
{
const char* name;
};
struct Glyph struct Glyph
{ {
unsigned short letter; unsigned short letter;
@ -806,31 +831,6 @@ namespace game
Glyph* glyphs; Glyph* glyphs;
}; };
enum GfxDrawSceneMethod
{
GFX_DRAW_SCENE_STANDARD = 0x0,
};
struct Material
{
const char* name;
};
enum MaterialTechniqueType
{
TECHNIQUE_UNLIT = 8,
TECHNIQUE_EMISSIVE = 9,
TECHNIQUE_LIT = 13,
};
struct GfxDrawMethod_s
{
int drawScene;
int baseTechType;
int emissiveTechType;
int forceTechType;
};
union XAssetHeader union XAssetHeader
{ {
void* data; void* data;