Changeset 7284 for code/trunk/data

Timestamp:

Aug 31, 2010, 3:37:40 AM (14 years ago)

Author:

landauf

Message:

merged consolecommands3 branch back to trunk.

note: the console command interface has changed completely, but the documentation is not yet up to date. just copy an existing command and change it to your needs, it's pretty self-explanatory. also the include files related to console commands are now located in core/command/. in the game it should work exactly like before, except for some changes in the auto-completion.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/gui/scripts/MiscConfigMenu.lua (modified) (2 diffs)
• data/levels/fps_test.oxw (modified) (1 diff)
• data/levels/old/physicstest2.oxw (modified) (1 diff)
• data/levels/presentation_FS10.oxw (modified) (1 diff)
• data/levels/presentation_FS10_ed.oxw (modified) (1 diff)
• data/tcl/irk/lib/irkreceive.tcl (modified) (14 diffs)

code/trunk/data/gui/scripts/MiscConfigMenu.lua

@@ -102 +102 @@
     local configvalue = winMgr:createWindow("MenuWidgets/Editbox", "orxonox/MiscConfigMenu/MiscConfigPane/ConfigCommand" .. k .. "/Configvalue")
     configvalue:setProperty("ReadOnly", "set:False")
-    orxonox.CommandExecutor:execute("getConfig " .. P.commandList[k])
-    local value = orxonox.CommandExecutor:getReturnValueString()
+    local value = orxonox.CommandExecutor:query("getConfig " .. P.commandList[k])
     configvalue:setText(value)
     P.sampleWindow:setText(value)
@@ -168 +167 @@
 
     orxonox.CommandExecutor:execute("config " .. P.commandList[commandNr] .. " " .. window:getText())
-    orxonox.CommandExecutor:execute("getConfig " .. P.commandList[commandNr])
-    local value = orxonox.CommandExecutor:getReturnValueString()
+    local value = orxonox.CommandExecutor:query("getConfig " .. P.commandList[commandNr])
     window:setText(value)
 end

code/trunk/data/levels/fps_test.oxw

@@ -20 +20 @@
    skybox       = "Orxonox/skypanoramagen1"
    gravity      = "0,-1000,0"
-   negativeWorldRange = "(-100000, -100000, -100000)"
-   positiveWorldRange = "( 100000,  100000,  100000)"
+   negativeWorldRange = "-100000, -100000, -100000"
+   positiveWorldRange = " 100000,  100000,  100000"
    hasPhysics   = true
   >

code/trunk/data/levels/old/physicstest2.oxw

@@ -13 +13 @@
    ambientlight = "0.5, 0.5, 0.5"
    skybox       = "Orxonox/Starbox"
-   negativeWorldRange = "(-100000, -100000, -100000)"
-   positiveWorldRange = "( 100000,  100000,  100000)"
+   negativeWorldRange = "-100000, -100000, -100000"
+   positiveWorldRange = " 100000,  100000,  100000"
    hasPhysics   = true
   >

code/trunk/data/levels/presentation_FS10.oxw

@@ -20 +20 @@
    skybox       = "Orxonox/skypanoramagen1"
    gravity      = "0,-1000,0"
-   negativeWorldRange = "(-100000, -100000, -100000)"
-   positiveWorldRange = "( 100000,  100000,  100000)"
+   negativeWorldRange = "-100000, -100000, -100000"
+   positiveWorldRange = " 100000,  100000,  100000"
    hasPhysics   = true
   >

code/trunk/data/levels/presentation_FS10_ed.oxw

@@ -20 +20 @@
    skybox       = "Orxonox/skypanoramagen1"
    gravity      = "0,-1000,0"
-   negativeWorldRange = "(-100000, -100000, -100000)"
-   positiveWorldRange = "( 100000,  100000,  100000)"
+   negativeWorldRange = "-100000, -100000, -100000"
+   positiveWorldRange = " 100000,  100000,  100000"
    hasPhysics   = true
   >

code/trunk/data/tcl/irk/lib/irkreceive.tcl

@@ -37 +37 @@
         append state($token,ERRORS) "$nick $dest $rest\n"
 #       puts "Got ERROR: $token $nick ---> $dest: $rest"
-        orxonox::execute error "Got ERROR: $token $nick ---> $dest: $rest"
+        ::orxonox::execute error "Got ERROR: $token $nick ---> $dest: $rest"
 
         return ""
@@ -53 +53 @@
         return ""
     }
-    
+
     # This procedure deals with the WHOIS USER message:
 
@@ -116 +116 @@
 
         set state($token,ident,$unick,ident) 1
-    }   
+    }
 
     # This procedure deals with the WHOIS CONNECTTIME message:
@@ -249 +249 @@
         if {[isus $token $nick]} {
 #           puts "You joined $dest"
-          orxonox::irc::info $token "You joined $dest"
+          ::orxonox::irc::info $token "You joined $dest"
 
             addChannel $token $dest
         } else {
 #           puts "$nick joined $dest"
-          orxonox::irc::info $token "$nick joined $dest"
+          ::orxonox::irc::info $token "$nick joined $dest"
 
             addToChannel $token $nick $dest
@@ -271 +271 @@
         if {[isus $token $nick]} {
 #           puts "You left channel $chan"
-          orxonox::irc::info $token "You left channel $chan"
+          ::orxonox::irc::info $token "You left channel $chan"
         } else {
 #           puts "$nick left [string tolower $dest]"
-          orxonox::irc::info $token "$nick left [string tolower $dest]"
-        }           
+          ::orxonox::irc::info $token "$nick left [string tolower $dest]"
+        }
         removeFromChannel $token $nick $chan
         removeFromChannel $token @$nick $chan
@@ -287 +287 @@
         set rest [eval concat $rest]
 #       puts "$nick sets mode $dest $rest"
-      orxonox::irc::info "$nick $token sets mode $dest $rest"
+      ::orxonox::irc::info "$nick $token sets mode $dest $rest"
 
         return ""
@@ -313 +313 @@
 
 #       puts "$nick ${user} ($token) changes his/her nickname to $newnick"
-      orxonox::irc::info $token "$nick changes his/her nickname to $newnick"
+      ::orxonox::irc::info $token "$nick changes his/her nickname to $newnick"
 
         return ""
@@ -325 +325 @@
         set rest [eval concat $rest]
 #       puts "Received QUIT $token $nick $rest"
-      orxonox::irc::info $token "Received QUIT $token $nick $rest"
+      ::orxonox::irc::info $token "Received QUIT $token $nick $rest"
 
         if {[string match ":*" $dest]} {
@@ -332 +332 @@
         if {[isus $token $nick]} {
 #           puts "You left the server $state($token,host) ($dest $rest)"
-          orxonox::irc::info $token "You left the server $state($token,host) ($dest $rest)"
+          ::orxonox::irc::info $token "You left the server $state($token,host) ($dest $rest)"
             forgetConnection $token
         } else {
@@ -352 +352 @@
         } else {
 #           puts "$nick$dest: [eval concat $rest]"
-          orxonox::irc::say $token $nick [eval concat $rest]
+          ::orxonox::irc::say $token $nick [eval concat $rest]
         }
 
@@ -426 +426 @@
         } else {
 #           puts "$nick: [eval concat $rest]"
-          orxonox::irc::privmsg $nick $nick [eval concat $rest]
+          ::orxonox::irc::privmsg $nick $nick [eval concat $rest]
         }
 
@@ -464 +464 @@
         if {[isus $token $kicked]} {
 #           puts "$nick kicked you from $dest because $reason"
-          orxonox::irc::info $token "$nick kicked you from $dest because $reason"
+          ::orxonox::irc::info $token "$nick kicked you from $dest because $reason"
 
             removeChannel $token $dest
         } else {
 #           puts "$nick kicks $kicked from $dest because $reason"
-          orxonox::irc::info $token "$nick kicks $kicked from $dest because $reason"
+          ::orxonox::irc::info $token "$nick kicks $kicked from $dest because $reason"
 
             removeFromChannel $token $kicked $dest
@@ -584 +584 @@
     proc RECV,CTCP,ACTION {token nick user comm dest action rest} {
 #       puts "$nick $rest"
-      orxonox::irc::action $token $nick $rest
+      ::orxonox::irc::action $token $nick $rest
 
         return ""
@@ -612 +612 @@
     proc defaultAction {token nick user comm dest rest} {
 #       puts "$token: $nick $user: $comm -> $dest ... [eval concat $rest]"
-      orxonox::execute log "$token: $nick $user: $comm -> $dest ... [eval concat $rest]"
+      ::orxonox::execute log "$token: $nick $user: $comm -> $dest ... [eval concat $rest]"
 
         return ""