mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-26 17:34:24 +02:00
Code Issues Projects Releases Wiki Activity

Fixed potential null reference

Browse Source
This commit is contained in:
mathusummut
2018-09-23 15:01:24 +02:00
parent dde3804f31
commit d7c63ed9dc
1 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
source/glest_game/main/intro.cpp
View File

@@ -556,48 +556,49 @@ namespace Glest {
Texture2D * Texture2D *
tex = intoTexList[i]; tex = intoTexList[i];
//printf("tex # %d [%s]\n",i,tex->getPath().c_str()); //printf("tex # %d [%s]\n",i,tex->getPath().c_str());
if (tex != NULL) {
Vec2i texPlacement;
if (i == 0 || i % 9 == 0) {
texPlacement = Vec2i(1, h - tex->getTextureHeight());
} else if (i == 1 || i % 9 == 1) {
texPlacement = Vec2i(1, 1);
} else if (i == 2 || i % 9 == 2) {
texPlacement = Vec2i(w - tex->getTextureWidth(), 1);
} else if (i == 3 || i % 9 == 3) {
texPlacement =
Vec2i(w - tex->getTextureWidth(),
h - tex->getTextureHeight());
} else if (i == 4 || i % 9 == 4) {
texPlacement =
Vec2i(w / 2 - tex->getTextureWidth() / 2,
h - tex->getTextureHeight());
} else if (i == 5 || i % 9 == 5) {
texPlacement = Vec2i(w / 2 - tex->getTextureWidth() / 2, 1);
} else if (i == 6 || i % 9 == 6) {
texPlacement =
Vec2i(1, (h / 2) - (tex->getTextureHeight() / 2));
} else if (i == 7 || i % 9 == 7) {
texPlacement =
Vec2i(w - tex->getTextureWidth(),
(h / 2) - (tex->getTextureHeight() / 2));
}
Vec2i texPlacement; int
if (i == 0 || i % 9 == 0) { textureStartTime = disappear * displayItemNumber;
texPlacement = Vec2i(1, h - tex->getTextureHeight()); if (lang.hasString("IntroTextureStartMilliseconds", "", true) ==
} else if (i == 1 || i % 9 == 1) { true) {
texPlacement = Vec2i(1, 1); textureStartTime =
} else if (i == 2 || i % 9 == 2) { strToInt(lang.getString("IntroTextureStartMilliseconds", "",
texPlacement = Vec2i(w - tex->getTextureWidth(), 1); true));
} else if (i == 3 || i % 9 == 3) { }
texPlacement =
Vec2i(w - tex->getTextureWidth(), texts.push_back(new
h - tex->getTextureHeight()); IntroText(tex, texPlacement,
} else if (i == 4 || i % 9 == 4) { Vec2i(tex->getTextureWidth(),
texPlacement = tex->getTextureHeight()),
Vec2i(w / 2 - tex->getTextureWidth() / 2, textureStartTime +
h - tex->getTextureHeight()); (showMiscTime * (i + 1))));
} else if (i == 5 || i % 9 == 5) {
texPlacement = Vec2i(w / 2 - tex->getTextureWidth() / 2, 1);
} else if (i == 6 || i % 9 == 6) {
texPlacement =
Vec2i(1, (h / 2) - (tex->getTextureHeight() / 2));
} else if (i == 7 || i % 9 == 7) {
texPlacement =
Vec2i(w - tex->getTextureWidth(),
(h / 2) - (tex->getTextureHeight() / 2));
} }
int
textureStartTime = disappear * displayItemNumber;
if (lang.hasString("IntroTextureStartMilliseconds", "", true) ==
true) {
textureStartTime =
strToInt(lang.getString("IntroTextureStartMilliseconds", "",
true));
}
texts.push_back(new
IntroText(tex, texPlacement,
Vec2i(tex->getTextureWidth(),
tex->getTextureHeight()),
textureStartTime +
(showMiscTime * (i + 1))));
} }
} }