[Gemrb-commits] gemrb: branch master updated. v0.6.2-934-ge5c5908

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  e5c5908c5703ca93fb974022e61a4744cffe3f07 (commit)

Summary of changes:
 gemrb/core/Projectile.h                   |    7 +++++--
 gemrb/plugins/PROImporter/PROImporter.cpp |   12 +++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)
      from  603c4565fa44d3c6b74f1c86b3f3bf7eedc49f9a (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=e5c5908c5703ca93fb974022e61a4744cffe3f07

commit e5c5908c5703ca93fb974022e61a4744cffe3f07
Author: Avenger <ave...@so...>
Date:   Wed Mar 16 22:43:56 2011 +0100

    read the tile fields

diff --git a/gemrb/core/Projectile.h b/gemrb/core/Projectile.h
index f66b8dc..07a9b52 100644
--- a/gemrb/core/Projectile.h
+++ b/gemrb/core/Projectile.h
@@ -79,7 +79,7 @@
 #define PEF_HALFTRANS  256     //half-transparency (holy might)
 #define PEF_TINT       512     //use palette gradient as tint
 #define PEF_ITERATION  1024    //create another projectile of type-1 (magic missiles)
-#define PEF_TILED      2048    //tiled AOE (bg1 cone of cold/fire)
+#define PEF_DEFSPELL   2048    //always apply the default spell on the caster
 #define PEF_FALLING    4096    //projectile falls down vertically (cow)
 #define PEF_INCOMING   8192    //projectile falls in on trajectory (comet)
 #define PEF_LINE       16384   //solid line between source and target (agannazar's scorcher)
@@ -145,7 +145,8 @@
 #define APF_COUNT_HD  1024
 //target flag enemy ally switched
 #define APF_INVERT_TARGET 2048
-//
+//tiled AoE animation
+#define APF_TILED 4096
 
 struct ProjectileExtension
 {
@@ -170,6 +171,8 @@ struct ProjectileExtension
 	//used for target or HD counting
 	ieWord DiceCount;
 	ieWord DiceSize;
+	ieWord TileX;
+	ieWord TileY;
 };
 
 class GEM_EXPORT Projectile
diff --git a/gemrb/plugins/PROImporter/PROImporter.cpp b/gemrb/plugins/PROImporter/PROImporter.cpp
index b205b62..013cc75 100644
--- a/gemrb/plugins/PROImporter/PROImporter.cpp
+++ b/gemrb/plugins/PROImporter/PROImporter.cpp
@@ -158,8 +158,18 @@ void PROImporter::GetAreaExtension(ProjectileExtension *e)
 	str->ReadDword( &e->APFlags );
 	str->ReadWord( &e->DiceCount );
 	str->ReadWord( &e->DiceSize );
+	str->ReadWord( &e->TileX );
+	str->ReadWord( &e->TileY );
+
+	if (!e->TileX) {
+		e->TileX=64;
+	}
+	if (!e->TileY) {
+		e->TileY=64;
+	}
+
 	//we skip the rest
-	str->Seek(184, GEM_CURRENT_POS);
+	str->Seek(180, GEM_CURRENT_POS);
 }
 
 #include "plugindef.h"

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


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