stratagus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Stratagus-CVS] stratagus/src/clone player.c unit_draw.c


From: Nehal Mistry
Subject: [Stratagus-CVS] stratagus/src/clone player.c unit_draw.c
Date: Mon, 17 Nov 2003 20:14:54 -0500

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Nehal Mistry <address@hidden>   03/11/17 20:14:53

Modified files:
        src/clone      : player.c unit_draw.c 

Log message:
        fix memcpy bugs

Patches:
Index: stratagus/src/clone/player.c
diff -u stratagus/src/clone/player.c:1.99 stratagus/src/clone/player.c:1.100
--- stratagus/src/clone/player.c:1.99   Mon Nov 17 14:14:28 2003
+++ stratagus/src/clone/player.c        Mon Nov 17 20:14:52 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: player.c,v 1.99 2003/11/17 19:14:28 nehalmistry Exp $
+//     $Id: player.c,v 1.100 2003/11/18 01:14:52 nehalmistry Exp $
 
 //@{
 
@@ -220,7 +220,7 @@
     int j;
 
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: players $Id: player.c,v 1.99 2003/11/17 
19:14:28 nehalmistry Exp $\n\n");
+    CLprintf(file, ";;; MODULE: players $Id: player.c,v 1.100 2003/11/18 
01:14:52 nehalmistry Exp $\n\n");
 
     //
     // Dump table wc2 race numbers -> internal symbol.
@@ -880,8 +880,8 @@
 global void GraphicPlayerPixels(const Player* player, const Graphic* sprite)
 {
 #ifdef USE_SDL_SURFACE
-    memcpy(&sprite->Palette->colors[208], player->UnitColors.Colors, 
-       sizeof(Pixels) * 4);
+    memcpy(&sprite->Surface->format->palette->colors[208], 
+       player->UnitColors.Colors, sizeof(SDL_Color) * 4);
 #else
     switch (VideoBpp) {
        case 8:
Index: stratagus/src/clone/unit_draw.c
diff -u stratagus/src/clone/unit_draw.c:1.183 
stratagus/src/clone/unit_draw.c:1.184
--- stratagus/src/clone/unit_draw.c:1.183       Mon Nov 17 14:14:29 2003
+++ stratagus/src/clone/unit_draw.c     Mon Nov 17 20:14:53 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: unit_draw.c,v 1.183 2003/11/17 19:14:29 nehalmistry Exp $
+//     $Id: unit_draw.c,v 1.184 2003/11/18 01:14:53 nehalmistry Exp $
 
 //@{
 
@@ -947,7 +947,7 @@
 global void SaveDecorations(CLFile* file)
 {
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: decorations $Id: unit_draw.c,v 1.183 
2003/11/17 19:14:29 nehalmistry Exp $\n\n");
+    CLprintf(file, ";;; MODULE: decorations $Id: unit_draw.c,v 1.184 
2003/11/18 01:14:53 nehalmistry Exp $\n\n");
 
     CLprintf(file, "(mana-sprite \"%s\"  %d %d  %d %d)\n",
        ManaSprite.File, ManaSprite.HotX, ManaSprite.HotY,
@@ -2009,8 +2009,8 @@
 local void GraphicUnitPixels(const Unit* unit, const Graphic* sprite)
 {
 #ifdef USE_SDL_SURFACE
-    memcpy(&sprite->Palette->colors[208], unit->Colors->Colors, 
-       sizeof(SDL_Color) * 4);
+    memcpy(&sprite->Surface->format->palette->colors[208], 
+       unit->Colors->Colors, sizeof(SDL_Color) * 4);
 #else
     switch (VideoBpp) {
        case 8:




reply via email to

[Prev in Thread] Current Thread [Next in Thread]