[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src include/missile.h missile/ccl_mis...
From: |
address@hidden |
Subject: |
[Stratagus-CVS] stratagus/src include/missile.h missile/ccl_mis... |
Date: |
17 Dec 2003 02:16:41 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 03/12/17 02:16:41
Modified files:
src/include : missile.h
src/missile : ccl_missile.c missile.c
Log message:
Added support for translucide missiles (crashes on load)
Patches:
Index: stratagus/src/include/missile.h
diff -u stratagus/src/include/missile.h:1.74
stratagus/src/include/missile.h:1.75
--- stratagus/src/include/missile.h:1.74 Sun Dec 14 07:54:15 2003
+++ stratagus/src/include/missile.h Wed Dec 17 02:16:40 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: missile.h,v 1.74 2003/12/13 20:54:15 jsalmon3 Exp $
+// $Id: missile.h,v 1.75 2003/12/16 15:16:40 mohydine Exp $
#ifndef __MISSILE_H__
#define __MISSILE_H__
@@ -96,6 +96,10 @@
**
** Number of directions missile can face.
**
+** MissileType::Transparency
+**
+** Set a missile transparency. Current supported value is 50 only.
+**
** MissileType::FiredSound
**
** Sound of the missile, if fired. @note currently not used.
@@ -396,7 +400,7 @@
char* Ident; /// missile name
char* File; /// missile sprite file
-
+ int Transparency; /// Missile transparency possible value
is 50 (later 25 and 75)
int Width; /// missile width in pixels
int Height; /// missile height in pixels
int DrawLevel; /// Level to draw missile at
Index: stratagus/src/missile/ccl_missile.c
diff -u stratagus/src/missile/ccl_missile.c:1.49
stratagus/src/missile/ccl_missile.c:1.50
--- stratagus/src/missile/ccl_missile.c:1.49 Mon Dec 15 15:16:49 2003
+++ stratagus/src/missile/ccl_missile.c Wed Dec 17 02:16:40 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_missile.c,v 1.49 2003/12/15 04:16:49 jsalmon3 Exp $
+// $Id: ccl_missile.c,v 1.50 2003/12/16 15:16:40 mohydine Exp $
//@{
@@ -111,6 +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("fired-sound"))) {
free(mtype->FiredSound.Name);
mtype->FiredSound.Name = gh_scm2newstr(gh_car(list),
NULL);
Index: stratagus/src/missile/missile.c
diff -u stratagus/src/missile/missile.c:1.117
stratagus/src/missile/missile.c:1.118
--- stratagus/src/missile/missile.c:1.117 Mon Dec 15 15:19:47 2003
+++ stratagus/src/missile/missile.c Wed Dec 17 02:16:41 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: missile.c,v 1.117 2003/12/15 04:19:47 jsalmon3 Exp $
+// $Id: missile.c,v 1.118 2003/12/16 15:16:41 mohydine Exp $
//@{
@@ -689,11 +689,20 @@
{
DebugCheck(mtype == NULL);
// FIXME: This is a hack for mirrored sprites
- if (frame < 0) {
- VideoDrawClipX(mtype->Sprite, -frame, x, y);
- } else {
- VideoDrawClip(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 {
+
+ if (frame < 0) {
+ VideoDrawClipX(mtype->Sprite, -frame, x, y);
+ } else {
+ VideoDrawClip(mtype->Sprite, frame, x, y);
+ }
+ }
}
/**
@@ -1336,7 +1345,7 @@
DebugCheck(file == NULL);
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: missile-types $Id: missile.c,v 1.117
2003/12/15 04:19:47 jsalmon3 Exp $\n\n");
+ CLprintf(file, ";;; MODULE: missile-types $Id: missile.c,v 1.118
2003/12/16 15:16:41 mohydine Exp $\n\n");
//
// Original number to internal missile-type name.
@@ -1364,6 +1373,9 @@
}
CLprintf(file, "\n 'num-directions %d", mtype->NumDirections);
CLprintf(file, "\n ");
+ if (mtype->Transparency) {
+ CLprintf(file, "\n 'transparency %d", mtype->Transparency);
+ }
if (mtype->FiredSound.Name) {
CLprintf(file, " 'fired-sound \"%s\"",
mtype->FiredSound.Name);
}
@@ -1453,7 +1465,7 @@
DebugCheck(file == NULL);
CLprintf(file,"\n;;; -----------------------------------------\n");
- CLprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.117 2003/12/15
04:19:47 jsalmon3 Exp $\n\n");
+ CLprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.118 2003/12/16
15:16:41 mohydine Exp $\n\n");
for (missiles = GlobalMissiles; *missiles; ++missiles) {
SaveMissile(*missiles, file);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src include/missile.h missile/ccl_mis...,
address@hidden <=