From: Jaka K. <lyn...@us...> - 2010-08-29 15:20:26
|
gemrb: Infinity Engine emulator The branch master has been updated via 8b0e254709113df99784c48108ed4b7606ce258d (commit) via 6a1d4ff40c5eb2d2cfea1d789073c23971966119 (commit) Summary of changes: gemrb/core/GameScript/Objects.cpp | 3 +++ gemrb/includes/ie_stats.h | 1 + gemrb/plugins/CHUImporter/CHUImporter.cpp | 2 +- 3 files changed, 5 insertions(+), 1 deletions(-) from 1120f03be87f483aedc0ad70df4ccbab018adcf0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=8b0e254709113df99784c48108ed4b7606ce258d commit 8b0e254709113df99784c48108ed4b7606ce258d Author: Jaka Kranjc <lyn...@us...> Date: Sun Aug 29 17:24:37 2010 +0200 added EA_NOTNEUTRAL diff --git a/gemrb/core/GameScript/Objects.cpp b/gemrb/core/GameScript/Objects.cpp index eb6be2f..a90ef03 100644 --- a/gemrb/core/GameScript/Objects.cpp +++ b/gemrb/core/GameScript/Objects.cpp @@ -1016,6 +1016,9 @@ int GameScript::ID_Allegiance(Actor *actor, int parameter) //notgood return value >= EA_NOTGOOD; + case EA_NOTNEUTRAL: + return value >=EA_EVILCUTOFF || value <= EA_GOODCUTOFF; + case EA_NOTEVIL: //notevil return value <= EA_NOTEVIL; diff --git a/gemrb/includes/ie_stats.h b/gemrb/includes/ie_stats.h index 9b53a51..9fae2f4 100644 --- a/gemrb/includes/ie_stats.h +++ b/gemrb/includes/ie_stats.h @@ -43,6 +43,7 @@ #define EA_NOTGOOD 31 #define EA_ANYTHING 126 #define EA_NEUTRAL 128 +#define EA_NOTNEUTRAL 198 #define EA_NOTEVIL 199 #define EA_EVILCUTOFF 200 #define EA_EVILBUTGREEN 201 http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=6a1d4ff40c5eb2d2cfea1d789073c23971966119 commit 6a1d4ff40c5eb2d2cfea1d789073c23971966119 Author: Jaka Kranjc <lyn...@us...> Date: Sun Aug 29 17:00:11 2010 +0200 CHUImporter: silenced a spammy message for special controls diff --git a/gemrb/plugins/CHUImporter/CHUImporter.cpp b/gemrb/plugins/CHUImporter/CHUImporter.cpp index e28dfdb..de26ba1 100644 --- a/gemrb/plugins/CHUImporter/CHUImporter.cpp +++ b/gemrb/plugins/CHUImporter/CHUImporter.cpp @@ -160,7 +160,7 @@ Window* CHUImporter::GetWindow(unsigned int wid) btn->SetFlags( Cycle&0xff00, BM_OR ); if (strnicmp( BAMFile, "guictrl\0", 8 ) == 0) { if (UnpressedIndex == 0) { - printMessage("CHUImporter", "Special Button Control, Skipping Image Loading\n",GREEN ); + //printMessage("CHUImporter", "Special Button Control, Skipping Image Loading\n",GREEN ); win->AddControl( btn ); break; } ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |