[Stratagus-CVS] stratagus/src/missile ccl_missile.c missile.c

[address@hidden]

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       03/12/17 06:19:37

Modified files:
        src/missile    : ccl_missile.c missile.c 

Log message:
        Fixed tabs, added transparency to lua

Patches:
Index: stratagus/src/missile/ccl_missile.c
diff -u stratagus/src/missile/ccl_missile.c:1.50 
stratagus/src/missile/ccl_missile.c:1.51
--- stratagus/src/missile/ccl_missile.c:1.50    Wed Dec 17 02:16:40 2003
+++ stratagus/src/missile/ccl_missile.c Wed Dec 17 06:19:36 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: ccl_missile.c,v 1.50 2003/12/16 15:16:40 mohydine Exp $
+//      $Id: ccl_missile.c,v 1.51 2003/12/16 19:19:36 jsalmon3 Exp $
 
 //@{
 
@@ -111,8 +111,8 @@
                        mtype->SpriteFrames = gh_scm2int(gh_car(list));
                } else if (gh_eq_p(value, gh_symbol2scm("num-directions"))) {
                        mtype->NumDirections = gh_scm2int(gh_car(list));
-        } else if (gh_eq_p(value, gh_symbol2scm("transparency"))) {
-            mtype->Transparency = gh_scm2int(gh_car(list));
+               } else if (gh_eq_p(value, gh_symbol2scm("transparency"))) {
+                       mtype->Transparency = gh_scm2int(gh_car(list));
                } else if (gh_eq_p(value, gh_symbol2scm("fired-sound"))) {
                        free(mtype->FiredSound.Name);
                        mtype->FiredSound.Name = gh_scm2newstr(gh_car(list), 
NULL);
@@ -226,6 +226,8 @@
                        mtype->SpriteFrames = LuaToNumber(l, -1);
                } else if (!strcmp(value, "NumDirections")) {
                        mtype->NumDirections = LuaToNumber(l, -1);
+               } else if (!strcmp(value, "transparency")) {
+                       mtype->Transparency = LuaToNumber(l, -1);
                } else if (!strcmp(value, "FiredSound")) {
                        free(mtype->FiredSound.Name);
                        mtype->FiredSound.Name = strdup(LuaToString(l, -1));
Index: stratagus/src/missile/missile.c
diff -u stratagus/src/missile/missile.c:1.119 
stratagus/src/missile/missile.c:1.120
--- stratagus/src/missile/missile.c:1.119       Wed Dec 17 06:11:33 2003
+++ stratagus/src/missile/missile.c     Wed Dec 17 06:19:36 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: missile.c,v 1.119 2003/12/16 19:11:33 mohydine Exp $
+//      $Id: missile.c,v 1.120 2003/12/16 19:19:36 jsalmon3 Exp $
 
 //@{
 
@@ -687,21 +687,21 @@
 */
 global void DrawMissile(const MissileType* mtype, int frame, int x, int y)
 {
-    DebugCheck(mtype == NULL);
+       DebugCheck(mtype == NULL);
        // FIXME: This is a hack for mirrored sprites
-    if (mtype->Transparency == 50) {
-        if (frame < 0) {
-               VideoDrawClipXTrans50(mtype->Sprite, -frame, x, y);
-       } else {
-               VideoDrawClipTrans50(mtype->Sprite, frame, x, y);
-       }
-    } else {
-       if (frame < 0) {
-               VideoDrawClipX(mtype->Sprite, -frame, x, y);
+       if (mtype->Transparency == 50) {
+               if (frame < 0) {
+                       VideoDrawClipXTrans50(mtype->Sprite, -frame, x, y);
+               } else {
+                       VideoDrawClipTrans50(mtype->Sprite, frame, x, y);
+               }
        } else {
-               VideoDrawClip(mtype->Sprite, frame, x, y);
+               if (frame < 0) {
+                       VideoDrawClipX(mtype->Sprite, -frame, x, y);
+               } else {
+                       VideoDrawClip(mtype->Sprite, frame, x, y);
+               }
        }
-    }
 }
 
 /**
@@ -1344,7 +1344,7 @@
 
        DebugCheck(file == NULL);
        CLprintf(file, "\n;;; -----------------------------------------\n");
-       CLprintf(file, ";;; MODULE: missile-types $Id: missile.c,v 1.119 
2003/12/16 19:11:33 mohydine Exp $\n\n");
+       CLprintf(file, ";;; MODULE: missile-types $Id: missile.c,v 1.120 
2003/12/16 19:19:36 jsalmon3 Exp $\n\n");
 
        //
        // Original number to internal missile-type name.
@@ -1372,9 +1372,9 @@
                }
                CLprintf(file, "\n  'num-directions %d", mtype->NumDirections);
                CLprintf(file, "\n ");
-        if (mtype->Transparency) {
-            CLprintf(file, "\n 'transparency %d", mtype->Transparency);
-        }
+               if (mtype->Transparency) {
+                       CLprintf(file, "\n 'transparency %d", 
mtype->Transparency);
+               }
                if (mtype->FiredSound.Name) {
                        CLprintf(file, " 'fired-sound \"%s\"", 
mtype->FiredSound.Name);
                }
@@ -1464,7 +1464,7 @@
 
        DebugCheck(file == NULL);
        CLprintf(file,"\n;;; -----------------------------------------\n");
-       CLprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.119 2003/12/16 
19:11:33 mohydine Exp $\n\n");
+       CLprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.120 2003/12/16 
19:19:36 jsalmon3 Exp $\n\n");
 
        for (missiles = GlobalMissiles; *missiles; ++missiles) {
                SaveMissile(*missiles, file);