[Stratagus-CVS] stratagus/src clone/ccl.c include/ui.h ui/ccl_u...

[ludovic pollet]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     ludovic pollet <address@hidden> 03/11/20 12:43:07

Modified files:
        src/clone      : ccl.c 
        src/include    : ui.h 
        src/ui         : ccl_ui.c interface.c 

Log message:
        made code look nicer

Patches:
Index: stratagus/src/clone/ccl.c
diff -u stratagus/src/clone/ccl.c:1.138 stratagus/src/clone/ccl.c:1.139
--- stratagus/src/clone/ccl.c:1.138     Thu Nov 20 12:21:32 2003
+++ stratagus/src/clone/ccl.c   Thu Nov 20 12:43:04 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ccl.c,v 1.138 2003/11/20 17:21:32 jsalmon3 Exp $
+//     $Id: ccl.c,v 1.139 2003/11/20 17:43:04 pludov Exp $
 
 //@{
 
@@ -2055,21 +2055,22 @@
     }
 
     fprintf(fd, ";;; -----------------------------------------\n");
-    fprintf(fd, ";;; $Id: ccl.c,v 1.138 2003/11/20 17:21:32 jsalmon3 Exp $\n");
+    fprintf(fd, ";;; $Id: ccl.c,v 1.139 2003/11/20 17:43:04 pludov Exp $\n");
 
     fprintf(fd, "(set-video-resolution! %d %d)\n", VideoWidth, VideoHeight);
     fprintf(fd, "(set-group-keys \"");
+
     i = 0;
-    while (ui_group_keys[i]) {
-       if (ui_group_keys[i]!='"') {
-           fprintf(fd, "%c", ui_group_keys[i]);
+    while (UiGroupKeys[i]) {
+       if (UiGroupKeys[i] != '"') {
+           fprintf(fd, "%c", UiGroupKeys[i]);
        } else {
            fprintf(fd, "\\\"");
        }
-       i++;
+       ++i;
     }
     fprintf(fd, "\")\n");
-    
+
     fclose(fd);
 #elif defined(USE_LUA)
 #ifdef USE_WIN32
@@ -2086,7 +2087,7 @@
     }
 
     fprintf(fd, "--[[\n");
-    fprintf(fd, "      $Id: ccl.c,v 1.138 2003/11/20 17:21:32 jsalmon3 Exp 
$\n");
+    fprintf(fd, "      $Id: ccl.c,v 1.139 2003/11/20 17:43:04 pludov Exp $\n");
     fprintf(fd, "]]\n");
 
     fprintf(fd, "SetVideoResolution(%d, %d)\n", VideoWidth, VideoHeight);
@@ -2113,7 +2114,7 @@
     }
 
     fprintf(fd, ";;; -----------------------------------------\n");
-    fprintf(fd, ";;; $Id: ccl.c,v 1.138 2003/11/20 17:21:32 jsalmon3 Exp $\n");
+    fprintf(fd, ";;; $Id: ccl.c,v 1.139 2003/11/20 17:43:04 pludov Exp $\n");
 
     // Global options
     if (OriginalFogOfWar) {
@@ -2194,7 +2195,7 @@
     }
 
     fprintf(fd, "--[[\n");
-    fprintf(fd, "      $Id: ccl.c,v 1.138 2003/11/20 17:21:32 jsalmon3 Exp 
$\n");
+    fprintf(fd, "      $Id: ccl.c,v 1.139 2003/11/20 17:43:04 pludov Exp $\n");
     fprintf(fd, "]]\n");
 
     fprintf(fd, "SetVideoFullscreen(%s)\n", VideoFullScreen ? "true" : 
"false");
@@ -2254,7 +2255,7 @@
     extern SCM oblistvar;
 
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: CCL $Id: ccl.c,v 1.138 2003/11/20 17:21:32 
jsalmon3 Exp $\n\n");
+    CLprintf(file, ";;; MODULE: CCL $Id: ccl.c,v 1.139 2003/11/20 17:43:04 
pludov Exp $\n\n");
 
     for (list = oblistvar; gh_list_p(list); list = gh_cdr(list)) {
        SCM sym;
Index: stratagus/src/include/ui.h
diff -u stratagus/src/include/ui.h:1.79 stratagus/src/include/ui.h:1.80
--- stratagus/src/include/ui.h:1.79     Thu Nov 20 08:48:03 2003
+++ stratagus/src/include/ui.h  Thu Nov 20 12:43:05 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ui.h,v 1.79 2003/11/20 13:48:03 pludov Exp $
+//     $Id: ui.h,v 1.80 2003/11/20 17:43:05 pludov Exp $
 
 #ifndef __UI_H__
 #define __UI_H__
@@ -352,7 +352,7 @@
 extern int SpeedKeyScroll;             /// Keyboard Scrolling Speed, in Frames
 extern int SpeedMouseScroll;           /// Mouse Scrolling Speed, in Frames
 
-extern char* ui_group_keys;            /// up to 11 keys used for group 
selection
+extern char* UiGroupKeys;              /// up to 11 keys used for group 
selection
 
 // only exported to save them
 
Index: stratagus/src/ui/ccl_ui.c
diff -u stratagus/src/ui/ccl_ui.c:1.157 stratagus/src/ui/ccl_ui.c:1.158
--- stratagus/src/ui/ccl_ui.c:1.157     Thu Nov 20 12:26:02 2003
+++ stratagus/src/ui/ccl_ui.c   Thu Nov 20 12:43:06 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ccl_ui.c,v 1.157 2003/11/20 17:26:02 jsalmon3 Exp $
+//     $Id: ccl_ui.c,v 1.158 2003/11/20 17:43:06 pludov Exp $
 
 //@{
 
@@ -7100,7 +7100,7 @@
 #if defined(USE_GUILE) || defined(USE_SIOD)
 local SCM CclSetGroupKeys(SCM list)
 {
-    ui_group_keys = gh_scm2newstr(list, NULL);
+    UiGroupKeys = gh_scm2newstr(list, NULL);
     return SCM_UNSPECIFIED;
 }
 #endif
Index: stratagus/src/ui/interface.c
diff -u stratagus/src/ui/interface.c:1.140 stratagus/src/ui/interface.c:1.141
--- stratagus/src/ui/interface.c:1.140  Thu Nov 20 08:48:05 2003
+++ stratagus/src/ui/interface.c        Thu Nov 20 12:43:06 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: interface.c,v 1.140 2003/11/20 13:48:05 pludov Exp $
+//     $Id: interface.c,v 1.141 2003/11/20 17:43:06 pludov Exp $
 
 //@{
 
@@ -78,7 +78,7 @@
 local int InputIndex;          /// current index into input
 local char InputStatusLine[99];        /// Last input status line
 local int SpeedCheat;          /// Speed up cheat
-local char* ui_group_keys="0123456789`";/// Up to 11 keys, last unselect. 
Default for qwerty
+local char* UiGroupKeys="0123456789`";/// Up to 11 keys, last unselect. 
Default for qwerty
 global char GameRunning;       /// Current running state
 global char GamePaused;                /// Current pause state
 global char GameObserve;       /// Observe mode
@@ -661,11 +661,11 @@
 */
 local int CommandKey(int key)
 {
-    char * ptr;
+    char* ptr;
     
     // FIXME: don't handle unicode well. Should work on all latin keyboard.
-    if ((ptr = strchr(ui_group_keys,key))) {
-       key = '0' + ptr - ui_group_keys;
+    if ((ptr = strchr(UiGroupKeys, key))) {
+       key = '0' + ptr - UiGroupKeys;
        if (key > '9') {
            key = '`';
        }