From: Laszlo T. <ave...@us...> - 2012-03-25 17:43:12
|
gemrb: Infinity Engine emulator The branch master has been updated via 559b6cc390fbc672b8ada118937b180d5170f20e (commit) via 907a0b46a3d8e86808cc48832d1f78307de488a5 (commit) Summary of changes: gemrb/core/Inventory.h | 5 +++-- gemrb/plugins/SDLVideo/SDLVideo.cpp | 12 ++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) from 12ac160284b3904f38d007fa88a76eb0648b12b7 (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=559b6cc390fbc672b8ada118937b180d5170f20e commit 559b6cc390fbc672b8ada118937b180d5170f20e Author: Avenger <ave...@so...> Date: Sun Mar 25 19:42:22 2012 +0200 fixed a bug in ItemExtHeader (valgrind is cool) diff --git a/gemrb/core/Inventory.h b/gemrb/core/Inventory.h index 98812ed..f84f13e 100644 --- a/gemrb/core/Inventory.h +++ b/gemrb/core/Inventory.h @@ -138,12 +138,13 @@ struct ItemExtHeader { ieByte Target; ieByte TargetNumber; ieWord Range; - ieWord ProjectileType; + //This was commented out in ITMExtHeader + //ieWord ProjectileType; ieWord Speed; ieWord THAC0Bonus; ieWord DiceSides; ieWord DiceThrown; - ieWord DamageBonus; + ieWordSigned DamageBonus; //this must be signed!!! ieWord DamageType; ieWord FeatureCount; ieWord FeatureOffset; http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=907a0b46a3d8e86808cc48832d1f78307de488a5 commit 907a0b46a3d8e86808cc48832d1f78307de488a5 Author: Avenger <ave...@so...> Date: Sun Mar 25 19:21:29 2012 +0200 really fixed the valgrind warning diff --git a/gemrb/plugins/SDLVideo/SDLVideo.cpp b/gemrb/plugins/SDLVideo/SDLVideo.cpp index 50520b3..46bdfab 100644 --- a/gemrb/plugins/SDLVideo/SDLVideo.cpp +++ b/gemrb/plugins/SDLVideo/SDLVideo.cpp @@ -108,11 +108,15 @@ int SDLVideoDriver::SwapBuffers(void) int SDLVideoDriver::PollEvents() { - int ret = GEM_OK; + int ret; SDL_Event currentEvent; - while ( ret == GEM_OK && SDL_PollEvent(¤tEvent) ) { + + if (!SDL_PollEvent(¤tEvent) ) return GEM_OK; + + do { ret = ProcessEvent(currentEvent); - } + } while (ret !=GEM_ERROR && SDL_PollEvent(¤tEvent) ); + bool eventWasMouseEvent = (currentEvent.type & (SDL_MOUSEMOTION | SDL_MOUSEBUTTONDOWN)); int x, y; if (ret == GEM_OK && !(MouseFlags & (MOUSE_DISABLED | MOUSE_GRAYED)) @@ -122,7 +126,7 @@ int SDLVideoDriver::PollEvents() lastMouseDownTime=lastTime + EvntManager->GetRKDelay(); if (!core->ConsolePopped) EvntManager->MouseUp( x, y, 1 << ( 0 ), GetModState(SDL_GetModState()) ); - } + } return ret; } ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |