stratagus-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Stratagus-CVS] stratagus doc/ChangeLog.html src/video/cursor.c...

From: Russell Smith
Subject: [Stratagus-CVS] stratagus doc/ChangeLog.html src/video/cursor.c...
Date: Wed, 17 Sep 2003 05:59:06 -0400 
CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Russell Smith <address@hidden>  03/09/17 05:59:05

Modified files:
        doc            : ChangeLog.html 
        src/video      : cursor.c 
        src/game       : loadgame.c 

Log message:
        Removed 'cursor-point hard coded type

Patches:
Index: stratagus/doc/ChangeLog.html
diff -u stratagus/doc/ChangeLog.html:1.529 stratagus/doc/ChangeLog.html:1.530
--- stratagus/doc/ChangeLog.html:1.529  Wed Sep 17 05:17:12 2003
+++ stratagus/doc/ChangeLog.html        Wed Sep 17 05:59:05 2003
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-----   $Id: ChangeLog.html,v 1.529 2003/09/17 09:17:12 mr-russ Exp $
+----   $Id: ChangeLog.html,v 1.530 2003/09/17 09:59:05 mr-russ Exp $
 
 ----   (c) Copyright 1998-2003 by Lutz Sammer
 
@@ -36,6 +36,7 @@
 <li>Future 1.19 Release<p>
     <ul>
     <li>++
+    <li>Removed 'cursor-point hard coded type (from Russell Smith).
     <li>Made Green Action Cross Configurable (from Russell Smith).
     <li>NEW_UI: Can highlight buttons now to show actions (from Martin Renold).
     <li>Removed old pathfinder, A-Star is not an option now (from Russell 
Smith).
Index: stratagus/src/game/loadgame.c
diff -u stratagus/src/game/loadgame.c:1.61 stratagus/src/game/loadgame.c:1.62
--- stratagus/src/game/loadgame.c:1.61  Sun Sep 14 02:53:08 2003
+++ stratagus/src/game/loadgame.c       Wed Sep 17 05:59:05 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: loadgame.c,v 1.61 2003/09/14 06:53:08 mr-russ Exp $
+//     $Id: loadgame.c,v 1.62 2003/09/17 09:59:05 mr-russ Exp $
 
 //@{
 
@@ -234,8 +234,6 @@
     LoadModules();
 
     GameCycle=game_cycle;
-    //GameCursor=TheUI.Point.Cursor;   // FIXME: just a default.
-    GameCursor=CursorTypeByIdent("cursor-point");      // TheUI not cleaned
     SelectionChanged();
     MustRedraw=RedrawEverything;
 }
Index: stratagus/src/video/cursor.c
diff -u stratagus/src/video/cursor.c:1.65 stratagus/src/video/cursor.c:1.66
--- stratagus/src/video/cursor.c:1.65   Thu Aug 21 17:55:45 2003
+++ stratagus/src/video/cursor.c        Wed Sep 17 05:59:05 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: cursor.c,v 1.65 2003/08/21 21:55:45 n0body Exp $
+//     $Id: cursor.c,v 1.66 2003/09/17 09:59:05 mr-russ Exp $
 
 //@{
 
@@ -817,8 +817,12 @@
     //
     // Last, Normal cursor.
     //  This will also save (part of) drawn rectangle cursor, but that's ok.
+    //  Cursor May not Exist if we are loading a game or something. Only
+    // draw it if it exists
     //
-    DrawCursor(GameCursor,CursorX,CursorY,GameCursor->SpriteFrame);
+    if( GameCursor ) {
+       DrawCursor(GameCursor,CursorX,CursorY,GameCursor->SpriteFrame);
+    }
 }
 
 /**
@@ -1116,7 +1120,7 @@
     int i;
 
     CLprintf(file,"\n;;; -----------------------------------------\n");
-    CLprintf(file,";;; MODULE: cursors $Id: cursor.c,v 1.65 2003/08/21 
21:55:45 n0body Exp $\n\n");
+    CLprintf(file,";;; MODULE: cursors $Id: cursor.c,v 1.66 2003/09/17 
09:59:05 mr-russ Exp $\n\n");
 
     for( i=0; Cursors[i].OType; ++i ) {
        CLprintf(file,"(define-cursor '%s '%s\n",
reply via email to
[Prev in Thread] Current Thread [Next in Thread]