From: Jaka K. <lyn...@us...> - 2013-01-22 16:25:09
|
gemrb: Infinity Engine emulator The branch master has been updated via 22d2d132e77a78391ae6574ef8e2ab08a9206e8b (commit) via 82305d583882968f3d4ad67b41d92006546f4ce6 (commit) Summary of changes: gemrb/GemRB.cpp | 3 ++- gemrb/core/Interface.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) from bdd7f239c53945a12c92c8e16c574f9bb4313d2f (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=22d2d132e77a78391ae6574ef8e2ab08a9206e8b commit 22d2d132e77a78391ae6574ef8e2ab08a9206e8b Author: Jaka Kranjc <lyn...@us...> Date: Tue Jan 22 17:23:25 2013 +0100 GemRB.cpp: move the using directive, so also the old android fg/bg callbacks get it diff --git a/gemrb/GemRB.cpp b/gemrb/GemRB.cpp index 10aaf15..1b0fbc7 100644 --- a/gemrb/GemRB.cpp +++ b/gemrb/GemRB.cpp @@ -31,6 +31,8 @@ #include <unistd.h> #endif +using namespace GemRB; + #ifdef ANDROID #include <SDL/SDL.h> // if/when android moves to SDL 1.3 remove these special functions. @@ -72,7 +74,6 @@ int main(int argc, char* argv[]) #endif mallopt(M_TRIM_THRESHOLD, 5*pagesize); #endif - using namespace GemRB; Interface::SanityCheck(VERSION_GEMRB); InitializeLogging(); http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=82305d583882968f3d4ad67b41d92006546f4ce6 commit 82305d583882968f3d4ad67b41d92006546f4ce6 Author: Jaka Kranjc <lyn...@us...> Date: Tue Jan 22 17:13:47 2013 +0100 Interface::InitItemTypes: fixed the itemtypedata vector size diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp index 62e22ec..ca613e5 100644 --- a/gemrb/core/Interface.cpp +++ b/gemrb/core/Interface.cpp @@ -4420,7 +4420,7 @@ bool Interface::InitItemTypes() //itemtype data stores (armor failure and critical damage multipliers), critical range itemtypedata.reserve(ItemTypes); for (i=0;i<ItemTypes;i++) { - itemtypedata.push_back(std::vector<int>(3)); + itemtypedata.push_back(std::vector<int>(4)); //default values in case itemdata is missing (it is needed only for iwd2) if (slotmatrix[i] & SLOT_WEAPON) { itemtypedata[i][IDT_FAILURE] = 0; // armor malus ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |