updated .gitignore, code-cosmetics

This commit is contained in:
Sebastian Krzyszkowiak 2017-10-30 21:17:47 +01:00
parent 977a03db1e
commit a4ec09d9cd
2 changed files with 20 additions and 7 deletions

23
.gitignore vendored
View file

@ -1,8 +1,19 @@
*~ /build*
/stuff
/CMakeLists.txt.user
/doc
allegro.log allegro.log
build
run
others
SuperDerpy.ini SuperDerpy.ini
sync* *~
*.user *#
._*
*.autosave
*.save
*.save.*
.directory
.DS_Store
.DS_Store?
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db

View file

@ -194,6 +194,8 @@ SYMBOL_EXPORT void FatalError(struct Game* game, bool exit, char* format, ...) {
va_end(vl); va_end(vl);
PrintConsole(game, text); PrintConsole(game, text);
// TODO: synchronize with loading thread
ALLEGRO_TRANSFORM trans; ALLEGRO_TRANSFORM trans;
al_identity_transform(&trans); al_identity_transform(&trans);
al_use_transform(&trans); al_use_transform(&trans);
@ -315,7 +317,7 @@ SYMBOL_EXPORT char* GetDataFilePath(struct Game* game, char* filename) {
#ifdef ALLEGRO_ANDROID #ifdef ALLEGRO_ANDROID
char origfn[255] = "android/"; char origfn[255] = "android/";
strcat(origfn, filename); strncat(origfn, filename, 246);
result = TestDataFilePath(game, origfn); result = TestDataFilePath(game, origfn);
if (result) { if (result) {