[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src clone/ccl.c clone/mainloop.c ui/c...
|
From: |
Jimmy Salmon |
|
Subject: |
[Stratagus-CVS] stratagus/src clone/ccl.c clone/mainloop.c ui/c... |
|
Date: |
Thu, 20 Nov 2003 12:56:39 -0500 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Jimmy Salmon <address@hidden> 03/11/20 12:56:39
Modified files:
src/clone : ccl.c mainloop.c
src/ui : ccl_ui.c interface.c
Log message:
Added SetGroupKeys, cleaned up spaces
Patches:
Index: stratagus/src/clone/ccl.c
diff -u stratagus/src/clone/ccl.c:1.139 stratagus/src/clone/ccl.c:1.140
--- stratagus/src/clone/ccl.c:1.139 Thu Nov 20 12:43:04 2003
+++ stratagus/src/clone/ccl.c Thu Nov 20 12:56:35 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl.c,v 1.139 2003/11/20 17:43:04 pludov Exp $
+// $Id: ccl.c,v 1.140 2003/11/20 17:56:35 jsalmon3 Exp $
//@{
@@ -168,7 +168,7 @@
{
int status;
int base;
-
+
base = lua_gettop(Lua) - narg; /* function index */
lua_pushliteral(Lua, "_TRACEBACK");
lua_rawget(Lua, LUA_GLOBALSINDEX); /* get traceback function */
@@ -225,12 +225,12 @@
}
#endif
-/**
+/**
** Convert a SCM to a string, SCM must be a symbol or string, else 0
** is returned
-**
+**
** @param scm the SCM to convert to string
-**
+**
** @return a string representing the SCM or 0 in case the conversion
** failed, caller must free() the returned value
*/
@@ -247,7 +247,7 @@
}
#else
char* str;
-
+
str = try_get_c_string(scm);
if (str) {
return strdup(str);
@@ -259,11 +259,11 @@
#elif defined(USE_LUA)
#endif
-/**
+/**
** Return the type of a smob
-**
+**
** @param smob
-**
+**
** @return type id of the smob
*/
#if defined(USE_GUILE) || defined(USE_SIOD)
@@ -275,18 +275,18 @@
} else {
return 0;
}
-#else
+#else
return TYPE(smob);
#endif
}
#elif defined(USE_LUA)
#endif
-/**
+/**
** Return the pointer that is stored in a smob
-**
+**
** @param smob the smob that contains the pointer
-**
+**
** @return pointer that was inside the smob
*/
#if defined(USE_GUILE) || defined(USE_SIOD)
@@ -301,9 +301,9 @@
#elif defined(USE_LUA)
#endif
-/**
+/**
** Store a pointer inside a SMOB, aka convert a pointer to a SCM
-**
+**
** @param tag The type of the pointer/smob
** @param ptr the pointer that should be converted to a SCM
*/
@@ -325,11 +325,11 @@
#elif defined(USE_LUA)
#endif
-/**
+/**
** Create a tag for a new type.
-**
-** @param name
-**
+**
+** @param name
+**
** @return The newly generated SMOB type
*/
#if defined(USE_GUILE) || defined(USE_SIOD)
@@ -382,7 +382,7 @@
local void DelProtectedCell(int id)
{
ProtectedCellCount--;
-
+
ProtectedCells[id]=ProtectedCells[ProtectedCellCount];
#ifdef CHECK_GC_VALUES
ProtectedCellValues[id]=ProtectedCellValues[ProtectedCellCount];
@@ -496,15 +496,15 @@
// FIXME: Doesn't handle nested protect/unprotects
while (!gh_null_p(old_lst)) {
- SCM el;
-
+ SCM el;
+
el = gh_car(old_lst);
- if (el != (*obj)) {
+ if (el != (*obj)) {
new_lst = cons(el, new_lst);
}
old_lst = gh_cdr(old_lst);
- }
-
+ }
+
setvar(sym, new_lst, NIL);
#else
gc_unprotect(obj);
@@ -564,8 +564,8 @@
}
#elif defined(USE_SIOD)
#ifdef SIOD_HEAP_GC
- static int cpt=0;
-
+ static int cpt = 0;
+
// Very slow, so differ as much as possible...
if (!(++cpt & 15)) {
user_gc(SCM_BOOL_F);
@@ -684,7 +684,7 @@
return 1;
}
#endif
-
+
/**
** Set the stratagus game-cycle
*/
@@ -1755,13 +1755,13 @@
#else
// Stop & copy GC : scan only allocated cells
sargv[2] = "-g1";
- // Cells are allocated in chunck of 40000 cells ( => 160Ko )
+ // Cells are allocated in chunck of 40000 cells ( => 160Ko )
sargv[3] = "-h40000";
#endif
buf = malloc(strlen(StratagusLibPath) + 4);
sprintf(buf, "-l%s", StratagusLibPath);
sargv[4] = buf; // never freed
-
+
siod_init(5, sargv);
repl_c_string(msg, 0, 0, sizeof(msg));
#elif defined(USE_LUA)
@@ -2035,6 +2035,7 @@
FILE* fd;
char buf[1024];
int i;
+
//
// preferences1.ccl
// This file is loaded before stratagus.ccl
@@ -2055,7 +2056,7 @@
}
fprintf(fd, ";;; -----------------------------------------\n");
- fprintf(fd, ";;; $Id: ccl.c,v 1.139 2003/11/20 17:43:04 pludov Exp $\n");
+ fprintf(fd, ";;; $Id: ccl.c,v 1.140 2003/11/20 17:56:35 jsalmon3 Exp $\n");
fprintf(fd, "(set-video-resolution! %d %d)\n", VideoWidth, VideoHeight);
fprintf(fd, "(set-group-keys \"");
@@ -2087,11 +2088,11 @@
}
fprintf(fd, "--[[\n");
- fprintf(fd, " $Id: ccl.c,v 1.139 2003/11/20 17:43:04 pludov Exp $\n");
+ fprintf(fd, " $Id: ccl.c,v 1.140 2003/11/20 17:56:35 jsalmon3 Exp
$\n");
fprintf(fd, "]]\n");
fprintf(fd, "SetVideoResolution(%d, %d)\n", VideoWidth, VideoHeight);
-
+
fclose(fd);
#endif
@@ -2114,7 +2115,7 @@
}
fprintf(fd, ";;; -----------------------------------------\n");
- fprintf(fd, ";;; $Id: ccl.c,v 1.139 2003/11/20 17:43:04 pludov Exp $\n");
+ fprintf(fd, ";;; $Id: ccl.c,v 1.140 2003/11/20 17:56:35 jsalmon3 Exp $\n");
// Global options
if (OriginalFogOfWar) {
@@ -2195,7 +2196,7 @@
}
fprintf(fd, "--[[\n");
- fprintf(fd, " $Id: ccl.c,v 1.139 2003/11/20 17:43:04 pludov Exp $\n");
+ fprintf(fd, " $Id: ccl.c,v 1.140 2003/11/20 17:56:35 jsalmon3 Exp
$\n");
fprintf(fd, "]]\n");
fprintf(fd, "SetVideoFullscreen(%s)\n", VideoFullScreen ? "true" :
"false");
@@ -2255,7 +2256,7 @@
extern SCM oblistvar;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: CCL $Id: ccl.c,v 1.139 2003/11/20 17:43:04
pludov Exp $\n\n");
+ CLprintf(file, ";;; MODULE: CCL $Id: ccl.c,v 1.140 2003/11/20 17:56:35
jsalmon3 Exp $\n\n");
for (list = oblistvar; gh_list_p(list); list = gh_cdr(list)) {
SCM sym;
Index: stratagus/src/clone/mainloop.c
diff -u stratagus/src/clone/mainloop.c:1.162
stratagus/src/clone/mainloop.c:1.163
--- stratagus/src/clone/mainloop.c:1.162 Thu Nov 20 08:48:01 2003
+++ stratagus/src/clone/mainloop.c Thu Nov 20 12:56:36 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: mainloop.c,v 1.162 2003/11/20 13:48:01 pludov Exp $
+// $Id: mainloop.c,v 1.163 2003/11/20 17:56:36 jsalmon3 Exp $
//@{
@@ -411,7 +411,7 @@
SetClipping(vp->X, vp->Y, vp->EndX, vp->EndY);
DrawMapBackgroundInViewport(vp, vp->MapX, vp->MapY);
-
+
//
// We find and sort units after draw level.
//
@@ -758,7 +758,7 @@
#endif
int player;
int RealVideoSyncSpeed;
-
+
GameCallbacks.ButtonPressed = HandleButtonDown;
GameCallbacks.ButtonReleased = HandleButtonUp;
GameCallbacks.MouseMoved = HandleMouseMove;
@@ -803,7 +803,7 @@
NetworkCommands(); // Get network commands
#ifdef MAP_REGIONS
MapSplitterEachCycle();
-#endif // MAP_REGIONS
+#endif // MAP_REGIONS
UnitActions(); // handle units
MissileActions(); // handle missiles
PlayersEachCycle(); // handle players
@@ -820,7 +820,7 @@
// Check rescue of units.
//
switch (GameCycle % CYCLES_PER_SECOND) {
- case 0:
+ case 0:
// At cycle 0 , start all ai players...
if (GameCycle == 0){
for (player = 0; player < NumPlayers; ++player){
@@ -830,7 +830,7 @@
// Clear scheme heap each second
// FIXME: this is too slow to call during the game
CclGarbageCollect(1);
- break;
+ break;
case 1:
HandleCloak();
break;
@@ -849,11 +849,11 @@
RescueUnits();
break;
default:
- // FIXME : assume that NumPlayers < (CYCLES_PER_SECOND -7)
+ // FIXME : assume that NumPlayers < (CYCLES_PER_SECOND -7)
player = (GameCycle % CYCLES_PER_SECOND) - 7;
if (player < NumPlayers){
PlayersEachSecond(player);
- }
+ }
}
//
@@ -881,7 +881,7 @@
TriggersEachCycle(); // handle triggers
UpdateMessages(); // update messages
-
+
PlayListAdvance(); // Check for next song
//
@@ -968,7 +968,7 @@
EndMenu();
}
}
-
+
//
// Game over
//
Index: stratagus/src/ui/ccl_ui.c
diff -u stratagus/src/ui/ccl_ui.c:1.158 stratagus/src/ui/ccl_ui.c:1.159
--- stratagus/src/ui/ccl_ui.c:1.158 Thu Nov 20 12:43:06 2003
+++ stratagus/src/ui/ccl_ui.c Thu Nov 20 12:56:37 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_ui.c,v 1.158 2003/11/20 17:43:06 pludov Exp $
+// $Id: ccl_ui.c,v 1.159 2003/11/20 17:56:37 jsalmon3 Exp $
//@{
@@ -187,7 +187,7 @@
SCM old;
old = NIL;
-
+
if (ClickMissile) {
old = gh_str02scm(ClickMissile);
free(ClickMissile);
@@ -1069,70 +1069,70 @@
MenuButtonId id;
if (gh_eq_p(value, gh_symbol2scm("main"))) {
- id = MBUTTON_MAIN;
+ id = MBUTTON_MAIN;
} else if (gh_eq_p(value, gh_symbol2scm("network"))) {
- id = MBUTTON_NETWORK;
+ id = MBUTTON_NETWORK;
} else if (gh_eq_p(value, gh_symbol2scm("gm-half"))) {
- id = MBUTTON_GM_HALF;
+ id = MBUTTON_GM_HALF;
} else if (gh_eq_p(value, gh_symbol2scm("132"))) {
- id = MBUTTON_132;
+ id = MBUTTON_132;
} else if (gh_eq_p(value, gh_symbol2scm("gm-full"))) {
- id = MBUTTON_GM_FULL;
+ id = MBUTTON_GM_FULL;
} else if (gh_eq_p(value, gh_symbol2scm("gem-round"))) {
- id = MBUTTON_GEM_ROUND;
+ id = MBUTTON_GEM_ROUND;
} else if (gh_eq_p(value, gh_symbol2scm("gem-square"))) {
- id = MBUTTON_GEM_SQUARE;
+ id = MBUTTON_GEM_SQUARE;
} else if (gh_eq_p(value, gh_symbol2scm("up-arrow"))) {
- id = MBUTTON_UP_ARROW;
+ id = MBUTTON_UP_ARROW;
} else if (gh_eq_p(value, gh_symbol2scm("down-arrow"))) {
- id = MBUTTON_DOWN_ARROW;
+ id = MBUTTON_DOWN_ARROW;
} else if (gh_eq_p(value, gh_symbol2scm("left-arrow"))) {
- id = MBUTTON_LEFT_ARROW;
+ id = MBUTTON_LEFT_ARROW;
} else if (gh_eq_p(value, gh_symbol2scm("right-arrow"))) {
- id = MBUTTON_RIGHT_ARROW;
+ id = MBUTTON_RIGHT_ARROW;
} else if (gh_eq_p(value, gh_symbol2scm("s-knob"))) {
- id = MBUTTON_S_KNOB;
+ id = MBUTTON_S_KNOB;
} else if (gh_eq_p(value, gh_symbol2scm("s-vcont"))) {
- id = MBUTTON_S_VCONT;
+ id = MBUTTON_S_VCONT;
} else if (gh_eq_p(value, gh_symbol2scm("s-hcont"))) {
- id = MBUTTON_S_HCONT;
+ id = MBUTTON_S_HCONT;
} else if (gh_eq_p(value, gh_symbol2scm("pulldown"))) {
- id = MBUTTON_PULLDOWN;
+ id = MBUTTON_PULLDOWN;
} else if (gh_eq_p(value, gh_symbol2scm("vthin"))) {
- id = MBUTTON_VTHIN;
+ id = MBUTTON_VTHIN;
} else if (gh_eq_p(value, gh_symbol2scm("folder"))) {
- id = MBUTTON_FOLDER;
+ id = MBUTTON_FOLDER;
} else if (gh_eq_p(value, gh_symbol2scm("sc-gem-round"))) {
- id = MBUTTON_SC_GEM_ROUND;
+ id = MBUTTON_SC_GEM_ROUND;
} else if (gh_eq_p(value, gh_symbol2scm("sc-gem-square"))) {
- id = MBUTTON_SC_GEM_SQUARE;
+ id = MBUTTON_SC_GEM_SQUARE;
} else if (gh_eq_p(value, gh_symbol2scm("sc-up-arrow"))) {
- id = MBUTTON_SC_UP_ARROW;
+ id = MBUTTON_SC_UP_ARROW;
} else if (gh_eq_p(value, gh_symbol2scm("sc-down-arrow"))) {
- id = MBUTTON_SC_DOWN_ARROW;
+ id = MBUTTON_SC_DOWN_ARROW;
} else if (gh_eq_p(value, gh_symbol2scm("sc-left-arrow"))) {
- id = MBUTTON_SC_LEFT_ARROW;
+ id = MBUTTON_SC_LEFT_ARROW;
} else if (gh_eq_p(value, gh_symbol2scm("sc-right-arrow"))) {
- id = MBUTTON_SC_RIGHT_ARROW;
+ id = MBUTTON_SC_RIGHT_ARROW;
} else if (gh_eq_p(value, gh_symbol2scm("sc-s-knob"))) {
- id = MBUTTON_SC_S_KNOB;
+ id = MBUTTON_SC_S_KNOB;
} else if (gh_eq_p(value, gh_symbol2scm("sc-s-vcont"))) {
- id = MBUTTON_SC_S_VCONT;
+ id = MBUTTON_SC_S_VCONT;
} else if (gh_eq_p(value, gh_symbol2scm("sc-s-hcont"))) {
- id = MBUTTON_SC_S_HCONT;
+ id = MBUTTON_SC_S_HCONT;
} else if (gh_eq_p(value, gh_symbol2scm("sc-pulldown"))) {
- id = MBUTTON_SC_PULLDOWN;
+ id = MBUTTON_SC_PULLDOWN;
} else if (gh_eq_p(value, gh_symbol2scm("sc-button-left"))) {
- id = MBUTTON_SC_BUTTON_LEFT;
+ id = MBUTTON_SC_BUTTON_LEFT;
} else if (gh_eq_p(value, gh_symbol2scm("sc-button"))) {
- id = MBUTTON_SC_BUTTON;
+ id = MBUTTON_SC_BUTTON;
} else if (gh_eq_p(value, gh_symbol2scm("sc-button-right"))) {
- id = MBUTTON_SC_BUTTON_RIGHT;
+ id = MBUTTON_SC_BUTTON_RIGHT;
} else {
- char *s1;
+ char* s1;
s1 = gh_scm2newstr(value, NULL);
- fprintf(stderr, "Unsupported button %s\n", s1);
- free(s1);
+ fprintf(stderr, "Unsupported button %s\n", s1);
+ free(s1);
return 0;
}
return id;
@@ -1161,67 +1161,67 @@
MenuButtonId id;
if (!strcmp(value, "main")) {
- id = MBUTTON_MAIN;
+ id = MBUTTON_MAIN;
} else if (!strcmp(value, "network")) {
- id = MBUTTON_NETWORK;
+ id = MBUTTON_NETWORK;
} else if (!strcmp(value, "gm-half")) {
- id = MBUTTON_GM_HALF;
+ id = MBUTTON_GM_HALF;
} else if (!strcmp(value, "132")) {
- id = MBUTTON_132;
+ id = MBUTTON_132;
} else if (!strcmp(value, "gm-full")) {
- id = MBUTTON_GM_FULL;
+ id = MBUTTON_GM_FULL;
} else if (!strcmp(value, "gem-round")) {
- id = MBUTTON_GEM_ROUND;
+ id = MBUTTON_GEM_ROUND;
} else if (!strcmp(value, "gem-square")) {
- id = MBUTTON_GEM_SQUARE;
+ id = MBUTTON_GEM_SQUARE;
} else if (!strcmp(value, "up-arrow")) {
- id = MBUTTON_UP_ARROW;
+ id = MBUTTON_UP_ARROW;
} else if (!strcmp(value, "down-arrow")) {
- id = MBUTTON_DOWN_ARROW;
+ id = MBUTTON_DOWN_ARROW;
} else if (!strcmp(value, "left-arrow")) {
- id = MBUTTON_LEFT_ARROW;
+ id = MBUTTON_LEFT_ARROW;
} else if (!strcmp(value, "right-arrow")) {
- id = MBUTTON_RIGHT_ARROW;
+ id = MBUTTON_RIGHT_ARROW;
} else if (!strcmp(value, "s-knob")) {
- id = MBUTTON_S_KNOB;
+ id = MBUTTON_S_KNOB;
} else if (!strcmp(value, "s-vcont")) {
- id = MBUTTON_S_VCONT;
+ id = MBUTTON_S_VCONT;
} else if (!strcmp(value, "s-hcont")) {
- id = MBUTTON_S_HCONT;
+ id = MBUTTON_S_HCONT;
} else if (!strcmp(value, "pulldown")) {
- id = MBUTTON_PULLDOWN;
+ id = MBUTTON_PULLDOWN;
} else if (!strcmp(value, "vthin")) {
- id = MBUTTON_VTHIN;
+ id = MBUTTON_VTHIN;
} else if (!strcmp(value, "folder")) {
- id = MBUTTON_FOLDER;
+ id = MBUTTON_FOLDER;
} else if (!strcmp(value, "sc-gem-round")) {
- id = MBUTTON_SC_GEM_ROUND;
+ id = MBUTTON_SC_GEM_ROUND;
} else if (!strcmp(value, "sc-gem-square")) {
- id = MBUTTON_SC_GEM_SQUARE;
+ id = MBUTTON_SC_GEM_SQUARE;
} else if (!strcmp(value, "sc-up-arrow")) {
- id = MBUTTON_SC_UP_ARROW;
+ id = MBUTTON_SC_UP_ARROW;
} else if (!strcmp(value, "sc-down-arrow")) {
- id = MBUTTON_SC_DOWN_ARROW;
+ id = MBUTTON_SC_DOWN_ARROW;
} else if (!strcmp(value, "sc-left-arrow")) {
- id = MBUTTON_SC_LEFT_ARROW;
+ id = MBUTTON_SC_LEFT_ARROW;
} else if (!strcmp(value, "sc-right-arrow")) {
- id = MBUTTON_SC_RIGHT_ARROW;
+ id = MBUTTON_SC_RIGHT_ARROW;
} else if (!strcmp(value, "sc-s-knob")) {
- id = MBUTTON_SC_S_KNOB;
+ id = MBUTTON_SC_S_KNOB;
} else if (!strcmp(value, "sc-s-vcont")) {
- id = MBUTTON_SC_S_VCONT;
+ id = MBUTTON_SC_S_VCONT;
} else if (!strcmp(value, "sc-s-hcont")) {
- id = MBUTTON_SC_S_HCONT;
+ id = MBUTTON_SC_S_HCONT;
} else if (!strcmp(value, "sc-pulldown")) {
- id = MBUTTON_SC_PULLDOWN;
+ id = MBUTTON_SC_PULLDOWN;
} else if (!strcmp(value, "sc-button-left")) {
- id = MBUTTON_SC_BUTTON_LEFT;
+ id = MBUTTON_SC_BUTTON_LEFT;
} else if (!strcmp(value, "sc-button")) {
- id = MBUTTON_SC_BUTTON;
+ id = MBUTTON_SC_BUTTON;
} else if (!strcmp(value, "sc-button-right")) {
- id = MBUTTON_SC_BUTTON_RIGHT;
+ id = MBUTTON_SC_BUTTON_RIGHT;
} else {
- lua_pushfstring(l, "Unsupported button: %s", value);
+ lua_pushfstring(l, "Unsupported button: %s", value);
lua_error(l);
id = 0;
}
@@ -2102,7 +2102,7 @@
ui->MenuPanel.File = NULL;
ui->MenuPanelX = -1;
ui->MenuPanelY = -1;
-
+
ui->MinimapPanel.File = NULL;
ui->MinimapPanelX = -1;
ui->MinimapPanelY = -1;
@@ -2356,7 +2356,7 @@
} else if (gh_eq_p(value, gh_symbol2scm("map-area"))) {
int w;
int h;
-
+
w = 0;
h = 0;
sublist = gh_car(list);
@@ -2754,7 +2754,7 @@
ui->MenuPanel.File = NULL;
ui->MenuPanelX = -1;
ui->MenuPanelY = -1;
-
+
ui->MinimapPanel.File = NULL;
ui->MinimapPanelX = -1;
ui->MinimapPanelY = -1;
@@ -4416,14 +4416,14 @@
int id;
if (gh_eq_p(value, gh_symbol2scm("sc-vslider"))) {
- id = MI_STYLE_SC_VSLIDER;
+ id = MI_STYLE_SC_VSLIDER;
} else if (gh_eq_p(value, gh_symbol2scm("sc-hslider"))) {
- id = MI_STYLE_SC_HSLIDER;
+ id = MI_STYLE_SC_HSLIDER;
} else {
char* s1;
s1 = gh_scm2newstr(value, NULL);
- fprintf(stderr, "Unsupported style %s\n", s1);
- free(s1);
+ fprintf(stderr, "Unsupported style %s\n", s1);
+ free(s1);
return 0;
}
return id;
@@ -4464,11 +4464,11 @@
int id;
if (!strcmp(value, "sc-vslider")) {
- id = MI_STYLE_SC_VSLIDER;
+ id = MI_STYLE_SC_VSLIDER;
} else if (!strcmp(value, "sc-hslider")) {
- id = MI_STYLE_SC_HSLIDER;
+ id = MI_STYLE_SC_HSLIDER;
} else {
- lua_pushfstring(l, "Unsupported style: %s", value);
+ lua_pushfstring(l, "Unsupported style: %s", value);
lua_error(l);
}
return id;
@@ -4515,10 +4515,10 @@
list = gh_cdr(list);
while (!gh_null_p(sublist)) {
-
+
value = gh_car(sublist);
sublist = gh_cdr(sublist);
-
+
if (gh_eq_p(value, gh_symbol2scm("active"))) {
item->flags |= MenuButtonActive;
} else if (gh_eq_p(value, gh_symbol2scm("clicked"))) {
@@ -4827,10 +4827,10 @@
slist = gh_car(sublist);
while (!gh_null_p(slist)) {
-
+
value = gh_car(slist);
slist = gh_cdr(slist);
-
+
if (gh_eq_p(value, gh_symbol2scm("up"))) {
item->d.vslider.cflags |= MI_CFLAGS_UP;
} else if (gh_eq_p(value, gh_symbol2scm("down"))) {
@@ -5020,10 +5020,10 @@
slist = gh_car(sublist);
while (!gh_null_p(slist)) {
-
+
value = gh_car(slist);
slist = gh_cdr(slist);
-
+
if (gh_eq_p(value, gh_symbol2scm("up"))) {
item->d.hslider.cflags |= MI_CFLAGS_UP;
} else if (gh_eq_p(value, gh_symbol2scm("down"))) {
@@ -5634,7 +5634,7 @@
lua_rawgeti(l, -1, subk + 1);
value = LuaToString(l, -1);
lua_pop(l, 1);
-
+
if (!strcmp(value, "up")) {
item->d.vslider.cflags |= MI_CFLAGS_UP;
} else if (!strcmp(value, "down")) {
@@ -5929,7 +5929,7 @@
lua_rawgeti(l, -1, subk + 1);
value = LuaToString(l, -1);
lua_pop(l, 1);
-
+
if (!strcmp(value, "up")) {
item->d.hslider.cflags |= MI_CFLAGS_UP;
} else if (!strcmp(value, "down")) {
@@ -6327,10 +6327,10 @@
free(ba.AllowStr);
}
if (ba.Hint) {
- free(ba.Hint);
+ free(ba.Hint);
}
if (ba.UnitMask) {
- free(ba.UnitMask);
+ free(ba.UnitMask);
}
return SCM_UNSPECIFIED;
@@ -6516,10 +6516,10 @@
free(ba.AllowStr);
}
if (ba.Hint) {
- free(ba.Hint);
+ free(ba.Hint);
}
if (ba.UnitMask) {
- free(ba.UnitMask);
+ free(ba.UnitMask);
}
return 0;
@@ -7060,7 +7060,7 @@
local SCM CclResetKeystrokeHelp(void)
{
int n;
-
+
n = nKeyStrokeHelps * 2;
while (n--) {
free(KeyStrokeHelps[n]);
@@ -7103,6 +7103,16 @@
UiGroupKeys = gh_scm2newstr(list, NULL);
return SCM_UNSPECIFIED;
}
+#elif defined(USE_LUA)
+local int CclSetGroupKeys(lua_State* l)
+{
+ if (lua_gettop(l) != 1) {
+ lua_pushstring(l, "incorrect argument");
+ lua_error(l);
+ }
+ UIGroupKeys = strdup(LuaToString(l, 1));
+ return 0;
+}
#endif
/**
@@ -7350,6 +7360,7 @@
//
lua_register(Lua, "ResetKeystrokeHelp", CclResetKeystrokeHelp);
lua_register(Lua, "AddKeystrokeHelp", CclAddKeystrokeHelp);
+ lua_register(Lua, "SetGroupKeys", CclSetGroupKeys);
#endif
InitMenuFuncHash();
Index: stratagus/src/ui/interface.c
diff -u stratagus/src/ui/interface.c:1.141 stratagus/src/ui/interface.c:1.142
--- stratagus/src/ui/interface.c:1.141 Thu Nov 20 12:43:06 2003
+++ stratagus/src/ui/interface.c Thu Nov 20 12:56:38 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: interface.c,v 1.141 2003/11/20 17:43:06 pludov Exp $
+// $Id: interface.c,v 1.142 2003/11/20 17:56:38 jsalmon3 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* UiGroupKeys="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
@@ -211,7 +211,7 @@
int n;
if (!(n = GetNumberUnitsOfGroup(group))) {
- return;
+ return;
}
//
@@ -662,7 +662,7 @@
local int CommandKey(int key)
{
char* ptr;
-
+
// FIXME: don't handle unicode well. Should work on all latin keyboard.
if ((ptr = strchr(UiGroupKeys, key))) {
key = '0' + ptr - UiGroupKeys;
@@ -670,7 +670,7 @@
key = '`';
}
}
-
+
switch (key) {
case '\r': // Return enters chat/input mode.
UiBeginInput();
@@ -679,13 +679,13 @@
case '^': // Unselect everything
case '`':
UiUnselectAll();
- break;
+ break;
- case '0': case '1': case '2': // Group selection
- case '3': case '4': case '5':
- case '6': case '7': case '8':
- case '9':
- if (KeyModifiers & ModifierShift) {
+ case '0': case '1': case '2': // Group selection
+ case '3': case '4': case '5':
+ case '6': case '7': case '8':
+ case '9':
+ if (KeyModifiers & ModifierShift) {
if (KeyModifiers & ModifierAlt) {
//UiAddToAlternateGroup(key-'0');
UiCenterOnGroup(key - '0');
@@ -704,7 +704,7 @@
UiSelectGroup(key - '0');
}
}
- break;
+ break;
#if 0
#ifdef DEBUG
@@ -732,7 +732,7 @@
if (!(KeyModifiers & (ModifierAlt | ModifierControl))) {
break;
}
- case KeyCodePause:
+ case KeyCodePause:
UiTogglePause();
break;
@@ -792,7 +792,7 @@
break;
case '+': // + Faster
- case '=': // plus is shift-equals.
+ case '=': // plus is shift-equals.
case KeyCodeKPPlus:
UiIncrementGameSpeed();
break;
@@ -889,9 +889,9 @@
UiEnterHelpMenu();
break;
- case ' ': // center on last action
- CenterOnMessage();
- break;
+ case ' ': // center on last action
+ CenterOnMessage();
+ break;
case '\t': // TAB toggles minimap.
// FIXME: more...
@@ -1134,7 +1134,7 @@
}
}
}
-
+
// Check for Replay and ffw x
#ifdef DEBUG
if (strncmp(Input,"ffw ",4) == 0) {
@@ -1143,7 +1143,7 @@
#endif
FastForwardCycle = atoi(&Input[4]);
}
-
+
if (Input[0]) {
// Replace ~ with ~~
for (p = Input; *p; ++p) {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src clone/ccl.c clone/mainloop.c ui/c...,
Jimmy Salmon <=