From 4189092db8e697e568f4dddf20e17b2e9bd8b7a5 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 24 Jun 2013 22:50:24 +0200 Subject: [PATCH 1/5] - spycancel improvement by Edward-san. --- src/g_game.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/g_game.cpp b/src/g_game.cpp index 10ab6afaf..0db149b0b 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -859,10 +859,10 @@ static void ChangeSpy (int changespy) // Otherwise, cycle to the next player. bool checkTeam = !demoplayback && deathmatch; - int pnum = int(players[consoleplayer].camera->player - players); - if (changespy == SPY_CANCEL) { - pnum = consoleplayer; - } else { + int pnum = consoleplayer; + if (changespy != SPY_CANCEL) + { + pnum = int(players[consoleplayer].camera->player - players); int step = (changespy == SPY_NEXT) ? 1 : -1; do From e989e11f5cac82bd7fe1201de099855dbaa4908b Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Mon, 24 Jun 2013 20:52:01 -0500 Subject: [PATCH 2/5] - update revision via popen() (via GZDoom OS X) --- tools/updaterevision/updaterevision.c | 31 +++++++-------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/tools/updaterevision/updaterevision.c b/tools/updaterevision/updaterevision.c index c1e3ccc8f..2ae577917 100644 --- a/tools/updaterevision/updaterevision.c +++ b/tools/updaterevision/updaterevision.c @@ -29,8 +29,7 @@ void stripnl(char *str) int main(int argc, char **argv) { - char *name; - char vertag[64], lastlog[64], lasthash[64], run[256], *hash = NULL; + char vertag[64], lastlog[64], lasthash[64], *hash = NULL; FILE *stream = NULL; int gotrev = 0, needupdate = 1; @@ -47,33 +46,19 @@ int main(int argc, char **argv) // on a tag, it returns that tag. Otherwise it returns --. // Use git log to get the time of the latest commit in ISO 8601 format and its full hash. - sprintf(run, "git describe --tags && git log -1 --format=%%ai*%%H", argv[1]); - if ((name = tempnam(NULL, "gitout")) != NULL) + stream = popen("git describe --tags && git log -1 --format=%ai*%H", "r"); + + if (NULL != stream) { -#ifdef __APPLE__ - // tempnam will return errno of 2 even though it is successful for our purposes. - errno = 0; -#endif - if((stream = freopen(name, "w+b", stdout)) != NULL && - system(run) == 0 && - errno == 0 && - fseek(stream, 0, SEEK_SET) == 0 && - fgets(vertag, sizeof vertag, stream) == vertag && - fgets(lastlog, sizeof lastlog, stream) == lastlog) + if (fgets(vertag, sizeof vertag, stream) == vertag && + fgets(lastlog, sizeof lastlog, stream) == lastlog) { stripnl(vertag); stripnl(lastlog); gotrev = 1; } - } - if (stream != NULL) - { - fclose(stream); - remove(name); - } - if (name != NULL) - { - free(name); + + pclose(stream); } if (gotrev) From b9d594982594a75f2cf7d03362f5695193532731 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Mon, 24 Jun 2013 20:52:52 -0500 Subject: [PATCH 3/5] - Add popen/pclose macros for updaterevision on Windows. --- tools/updaterevision/updaterevision.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/updaterevision/updaterevision.c b/tools/updaterevision/updaterevision.c index 2ae577917..da0337a61 100644 --- a/tools/updaterevision/updaterevision.c +++ b/tools/updaterevision/updaterevision.c @@ -14,6 +14,11 @@ #include #include +#ifdef _WIN32 +#define popen _popen +#define pclose _pclose +#endif + // Used to strip newline characters from lines read by fgets. void stripnl(char *str) { From 1032170ccd09941b438390070d4aed91dac7adea Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Mon, 24 Jun 2013 20:53:49 -0500 Subject: [PATCH 4/5] - Add .aps files to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 822d07fb2..09e3fb4c4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.suo *.pdb *.ilk +*.aps /Release /wadsrc_wad *.user From a5f5d8adcbd107098c5f2a9f59b160691a41dc65 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Mon, 24 Jun 2013 20:58:14 -0500 Subject: [PATCH 5/5] - Remove the first parameter from updaterevision, since it isn't needed with git. --- src/CMakeLists.txt | 2 +- tools/updaterevision/updaterevision.c | 12 ++++++------ zdoom.vcproj | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6ba807090..a8abc70c8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -488,7 +488,7 @@ endif( BACKPATCH ) get_target_property( UPDATEREVISION_EXE updaterevision LOCATION ) add_custom_target( revision_check ALL - COMMAND ${UPDATEREVISION_EXE} . src/gitinfo.h + COMMAND ${UPDATEREVISION_EXE} src/gitinfo.h WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} DEPENDS updaterevision ) diff --git a/tools/updaterevision/updaterevision.c b/tools/updaterevision/updaterevision.c index da0337a61..90127130a 100644 --- a/tools/updaterevision/updaterevision.c +++ b/tools/updaterevision/updaterevision.c @@ -41,9 +41,9 @@ int main(int argc, char **argv) vertag[0] = '\0'; lastlog[0] = '\0'; - if (argc != 3) + if (argc != 2) { - fprintf(stderr, "Usage: %s \n", argv[0]); + fprintf(stderr, "Usage: %s \n", argv[0]); return 1; } @@ -85,7 +85,7 @@ int main(int argc, char **argv) hash = lastlog + 1; } - stream = fopen (argv[2], "r"); + stream = fopen (argv[1], "r"); if (stream != NULL) { if (!gotrev) @@ -109,7 +109,7 @@ int main(int argc, char **argv) if (needupdate) { - stream = fopen (argv[2], "w"); + stream = fopen (argv[1], "w"); if (stream == NULL) { return 1; @@ -125,11 +125,11 @@ int main(int argc, char **argv) "#define GIT_TIME \"%s\"\n", hash, vertag, hash, lastlog); fclose(stream); - fprintf(stderr, "%s updated to commit %s.\n", argv[2], vertag); + fprintf(stderr, "%s updated to commit %s.\n", argv[1], vertag); } else { - fprintf (stderr, "%s is up to date at commit %s.\n", argv[2], vertag); + fprintf (stderr, "%s is up to date at commit %s.\n", argv[1], vertag); } return 0; diff --git a/zdoom.vcproj b/zdoom.vcproj index 99b52e4c8..89cf4c7b0 100644 --- a/zdoom.vcproj +++ b/zdoom.vcproj @@ -29,7 +29,7 @@