kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripterr fix

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6497 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Bukz
2011-06-04 17:10:55 +00:00
parent f891f1dff3
commit 9c9e7dc361
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/scripts.cfg
+4 -3
View File
@@ -171,9 +171,9 @@ zoom = [
] [ sensitivity $oldsens; setscope 0 ]
]
delta_game_0 = [ if (= $arg1 1) [ shiftweapon 1 ] [ shiftweapon -1 ] ]
delta_game_1 = [ if (checkrange (+ $gamma $arg1) 30 300) [ gamma (+ $gamma $arg1) ] ]
delta_game_2 = [ if (checkrange (+ $fov $arg1) 75 120) [ fov (+ $fov $arg1) ] ]
delta_game_0 = [ if (= $arg1 1) [ shiftweapon 1 ] [ shiftweapon -1 ] ] // Cycle through weapons
delta_game_1 = [ if (checkrange (+ $gamma $arg1) 30 300) [ gamma (+ $gamma $arg1) ] ] // Tweak gamma
delta_game_2 = [ if (checkrange (+ $fov $arg1) 75 120) [ fov (+ $fov $arg1) ] ] // Tweak fov
delta_spect_0 = [ changefollowplayer $arg1 ]
// Map editing using the mousewheel...
@@ -201,6 +201,7 @@ delta_edit_6 = [ entproperty $editaxis $arg1 ] // Move map entity...
delta_edit_7 = [ entproperty 1 $arg1 ] // Changes the second value on entities...
delta_edit_8 = [ entproperty 2 $arg1 ] // Changes the third value on entities...
delta_edit_9 = [ entproperty 3 $arg1 ] // Changes the fourth value on entities...
delta_edit_10 = [ if (checkrange (+f $flyspeed (divf $arg1 4)) 1 5) [ flyspeed (+f $flyspeed (divf $arg1 4)) ] ] // Tweak flyspeed
// HUD toggles
toggleshowmap = [ showmap 1; onrelease [ showmap 0 ] ]
source/src/command.cpp
+1 -1
View File
@@ -628,7 +628,7 @@ char *executeret(const char *p) // all evaluation hap
{
f1 = f1<id->minvalf ? id->minvalf : id->maxvalf; // clamp to valid range
conoutf("valid range for %s is %s..%s", id->name, floatstr(id->minvalf), floatstr(id->maxvalf));
scripterr();
//scripterr(); // Why throw this error here when it's not done for ID_VAR above? Only difference is datatype, both are "valid range errors". // Bukz 2011june04
}
*id->storage.f = f1;
if(id->fun) ((void (__cdecl *)())id->fun)(); // call trigger function if available