From: Brad A. <br...@us...> - 2012-06-18 05:50:33
|
gemrb: Infinity Engine emulator The branch master has been updated via 00a74051a5fe215cabe7f8541a99b50b12049544 (commit) via f160faf9fbfbb465df7fcf34c00f8ff1450b1a96 (commit) Summary of changes: gemrb/core/GUI/GameControl.cpp | 3 --- gemrb/plugins/GUIScript/GUIScript.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) from f12332b196cac82627f60208db6f8cd14970c333 (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=00a74051a5fe215cabe7f8541a99b50b12049544 commit 00a74051a5fe215cabe7f8541a99b50b12049544 Author: Brad Allred <bra...@me...> Date: Sun Jun 17 22:31:01 2012 -0600 GUIScript: you only have to check < 0 if you use a signed 16bit type :) diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp index 4f46b1b..b8ebd9e 100644 --- a/gemrb/plugins/GUIScript/GUIScript.cpp +++ b/gemrb/plugins/GUIScript/GUIScript.cpp @@ -823,7 +823,8 @@ PyDoc_STRVAR( GemRB_Window_SetPos__doc, static PyObject* GemRB_Window_SetPos(PyObject * /*self*/, PyObject* args) { - int WindowIndex, X, Y, Flags = WINDOW_TOPLEFT; + ieWordSigned WindowIndex, X, Y; + int Flags = WINDOW_TOPLEFT; if (!PyArg_ParseTuple( args, "iii|i", &WindowIndex, &X, &Y, &Flags )) { return AttributeError( GemRB_Window_SetPos__doc ); @@ -854,10 +855,9 @@ static PyObject* GemRB_Window_SetPos(PyObject * /*self*/, PyObject* args) // Keep window within screen // FIXME: keep it within gamecontrol if (Flags & WINDOW_BOUNDED) { - // FIXME: grrrr, should be < 0!!! - if (X > 32767 || X < 0) + if (X < 0) X = 0; - if (Y > 32767 || Y < 0) + if (Y < 0) Y = 0; if (X + win->Width >= core->Width) http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=f160faf9fbfbb465df7fcf34c00f8ff1450b1a96 commit f160faf9fbfbb465df7fcf34c00f8ff1450b1a96 Author: Brad Allred <bra...@me...> Date: Sun Jun 17 22:01:38 2012 -0600 GameControl: this hasn't been needed since formation rotation patch. Actors are no longer responsible for their reticle drawing. diff --git a/gemrb/core/GUI/GameControl.cpp b/gemrb/core/GUI/GameControl.cpp index d5bcb01..ecfe5f7 100644 --- a/gemrb/core/GUI/GameControl.cpp +++ b/gemrb/core/GUI/GameControl.cpp @@ -275,9 +275,6 @@ void GameControl::CreateMovement(Actor *actor, const Point &p) actor->AddAction( action ); actor->CommandActor(); - // force action so that we get target reticles immediately - // FIXME - actor->ProcessActions(); } GameControl::~GameControl(void) ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |