From a4ec09d9cdaa7a46623d460c785d02d74f36dfd2 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Mon, 30 Oct 2017 21:17:47 +0100 Subject: [PATCH] updated .gitignore, code-cosmetics --- .gitignore | 23 +++++++++++++++++------ src/utils.c | 4 +++- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a864746..2a111f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,19 @@ -*~ +/build* +/stuff +/CMakeLists.txt.user +/doc allegro.log -build -run -others SuperDerpy.ini -sync* -*.user +*~ +*# +._* +*.autosave +*.save +*.save.* +.directory +.DS_Store +.DS_Store? +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db diff --git a/src/utils.c b/src/utils.c index 199f4b2..e3e8c89 100644 --- a/src/utils.c +++ b/src/utils.c @@ -194,6 +194,8 @@ SYMBOL_EXPORT void FatalError(struct Game* game, bool exit, char* format, ...) { va_end(vl); PrintConsole(game, text); + // TODO: synchronize with loading thread + ALLEGRO_TRANSFORM trans; al_identity_transform(&trans); al_use_transform(&trans); @@ -315,7 +317,7 @@ SYMBOL_EXPORT char* GetDataFilePath(struct Game* game, char* filename) { #ifdef ALLEGRO_ANDROID char origfn[255] = "android/"; - strcat(origfn, filename); + strncat(origfn, filename, 246); result = TestDataFilePath(game, origfn); if (result) {