[Wesnoth-cvs-commits] wesnoth data/game.cfg src/game.cpp

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      04/11/01 20:15:01

Modified files:
        data           : game.cfg 
        src            : game.cpp 

Log message:
        Trying to make the default shorcuts on macs be coherent with standard 
mac
        shortcuts. Can't test if this works, though.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/game.cfg.diff?tr1=1.129&tr2=1.130&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.157&tr2=1.158&r1=text&r2=text

Patches:
Index: wesnoth/data/game.cfg
diff -u wesnoth/data/game.cfg:1.129 wesnoth/data/game.cfg:1.130
--- wesnoth/data/game.cfg:1.129 Fri Oct 22 08:47:08 2004
+++ wesnoth/data/game.cfg       Mon Nov  1 20:14:58 2004
@@ -84,6 +84,176 @@
        
 [/game_config]
 
+#ifdef APPLE
+       [hotkey]
+       command=preferences
+       key=p
+       cmd=yes
+       [/hotkey]
+       [hotkey]
+       command=undo
+       key=u
+       [/hotkey]
+       [hotkey]
+       command=redo
+       key=r
+       [/hotkey]
+       [hotkey]
+       command=recruit
+       key=r
+       cmd=yes
+       [/hotkey]
+       [hotkey]
+       command=repeatrecruit
+       key=r
+       cmd=yes
+       shift=yes
+       [/hotkey]
+       [hotkey]
+       command=recall
+       key=r
+       alt=yes
+       [/hotkey]
+       [hotkey]
+       command=cycle
+       key=n
+       [/hotkey]
+       [hotkey]
+       command=endunitturn
+       key=" "
+       [/hotkey]
+       [hotkey]
+       command=leader
+       key=l
+       [/hotkey]
+       [hotkey]
+       command=zoomin
+       key=z
+       [/hotkey]
+       [hotkey]
+       command=zoomout
+       key=x
+       [/hotkey]
+       [hotkey]
+       command=zoomdefault
+       key=c
+       [/hotkey]
+       [hotkey]
+       command=fullscreen
+       key=f
+       cmd=yes
+       [/hotkey]
+       [hotkey]
+       command=accelerated
+       key=a
+       cmd=yes
+       [/hotkey]
+       [hotkey]
+       command=resistance
+       key=d
+       cmd=yes
+       [/hotkey]
+       [hotkey]
+       command=describeunit
+       key=d
+       [/hotkey]
+       [hotkey]
+       command=renameunit
+       key=n
+       cmd=yes
+       [/hotkey]
+       [hotkey]
+       command=terraintable
+       key=t
+       cmd=yes
+       [/hotkey]
+       [hotkey]
+       command=save
+       key=s
+       cmd=yes
+       [/hotkey]
+       [hotkey]
+       command=load
+       key=l
+       cmd=yes
+       [/hotkey]
+       [hotkey]
+       command=statustable
+       key=s
+       alt=yes
+       [/hotkey]
+       [hotkey]
+       command=endturn
+       key=e
+       alt=yes
+       [/hotkey]
+       [hotkey]
+       command=togglegrid
+       key=g
+       cmd=yes
+       [/hotkey]
+       [hotkey]
+       command=mute
+       key=m
+       cmd=yes
+       [/hotkey]
+       [hotkey]
+       command=labelterrain
+       key=l
+       alt=yes
+       [/hotkey]
+       [hotkey]
+       command=showenemymoves
+       key=v
+       cmd=yes
+       [/hotkey]
+       [hotkey]
+       command=bestenemymoves
+       key=b
+       cmd=yes
+       [/hotkey]
+       [hotkey]
+       command=toggleshroud
+       key=k
+       alt=yes
+       [/hotkey]
+       [hotkey]
+       command=updateshroud
+       key=k
+       cmd=yes
+       [/hotkey]
+       [hotkey]
+       command=speak
+       key=m
+       [/hotkey]
+       [hotkey]
+       command=continue
+       key=t
+       [/hotkey]
+       [hotkey]
+       command=search
+       key=/
+       [/hotkey]
+       [hotkey]
+       command=speaktoally
+       key=m
+       shift=yes
+       [/hotkey]
+       [hotkey]
+       command=speaktoall
+       key=m
+       alt=yes
+       [/hotkey]
+       [hotkey]
+       command=help
+       key=F1
+       [/hotkey]
+       [hotkey]
+       command=command
+       key=;
+       shift=yes
+       [/hotkey]
+#else
        [hotkey]
        command=preferences
        key=p
@@ -252,6 +422,7 @@
        key=;
        shift=yes
        [/hotkey]
+#endif
 
 [+units]
        {units}
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.157 wesnoth/src/game.cpp:1.158
--- wesnoth/src/game.cpp:1.157  Mon Nov  1 19:14:18 2004
+++ wesnoth/src/game.cpp        Mon Nov  1 20:14:58 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.157 2004/11/01 19:14:18 cedricd Exp $ */
+/* $Id: game.cpp,v 1.158 2004/11/01 20:14:58 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -568,6 +568,10 @@
        defines_map_.clear();
 
        //load in the game's configuration files
+#if defined(APPLE)
+       defines_map_["APPLE"] = preproc_define();
+#endif
+
        defines_map_["NORMAL"] = preproc_define();
        defines_map_["MEDIUM"] = preproc_define();