[Gemrb-commits] gemrb: branch master updated. v0.7.0-185-g2fa05fc

[Laszlo T. <ave...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  2fa05fce2cfc8854e09a48eaecbebfbebc5c15ef (commit)
       via  b3690eaa2e9b3c37a45a4800ae9c77dd3c0d32ce (commit)

Summary of changes:
 gemrb/includes/opcode_params.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
      from  2c23e849becd324ccfc45522732af3525b8c06fb (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=2fa05fce2cfc8854e09a48eaecbebfbebc5c15ef

commit 2fa05fce2cfc8854e09a48eaecbebfbebc5c15ef
Merge: b3690ea 2c23e84
Author: Avenger <ave...@so...>
Date:   Sun Jan 29 19:23:16 2012 +0100

    Merge branch 'master' of ssh://gemrb.git.sourceforge.net/gitroot/gemrb/gemrb


http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=b3690eaa2e9b3c37a45a4800ae9c77dd3c0d32ce

commit b3690eaa2e9b3c37a45a4800ae9c77dd3c0d32ce
Author: Avenger <ave...@so...>
Date:   Sun Jan 29 19:22:20 2012 +0100

    iwd2 specific poison codes

diff --git a/gemrb/includes/opcode_params.h b/gemrb/includes/opcode_params.h
index 28792dd..d0f0d05 100644
--- a/gemrb/includes/opcode_params.h
+++ b/gemrb/includes/opcode_params.h
@@ -34,6 +34,10 @@
 //only poison
 #define RPD_ROUNDS  4
 #define RPD_TURNS   5
+//iwd2 specific poison types
+#define RPD_SNAKE   6
+#define RPD_7       7
+#define RPD_ENVENOM 8
 //only disease
 #define RPD_STR 4
 #define RPD_DEX 5

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator