qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-25 22:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[cl_menu,scheme] Clean up after tightened pointer checks

Browse source
This commit is contained in:
Bill Currie 2020-03-05 15:02:40 +09:00
parent 2ddfe2ef07
commit a4582e526d
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ruamoko/cl_menu/options.r
View file

@ -130,7 +130,7 @@ MENU_video_options (PLItem *plist)
if (plist) { if (plist) {
ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"video_options"]); ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"video_options"]);
video_options = ret.pointer_val; video_options = (Group *) ret.pointer_val;
} }
Menu_End (); Menu_End ();
@ -177,7 +177,7 @@ MENU_audio_options (PLItem *plist)
if (plist) { if (plist) {
ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"audio_options"]); ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"audio_options"]);
audio_options = ret.pointer_val; audio_options = (Group *) ret.pointer_val;
} }
Menu_End (); Menu_End ();
@ -224,7 +224,7 @@ MENU_control_options (PLItem *plist)
if (plist) { if (plist) {
ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"control_options"]); ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"control_options"]);
control_options = ret.pointer_val; control_options = (Group *) ret.pointer_val;
} }
MENU_control_binding (); //FIXME how to hook in the bindings menu? MENU_control_binding (); //FIXME how to hook in the bindings menu?
@ -275,7 +275,7 @@ MENU_feature_options (PLItem *plist)
if (plist) { if (plist) {
ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"feature_options"]); ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"feature_options"]);
feature_options = ret.pointer_val; feature_options = (Group *) ret.pointer_val;
} }
Menu_End (); Menu_End ();
@ -361,7 +361,7 @@ MENU_player_options (PLItem *plist)
if (plist) { if (plist) {
ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"player_options"]); ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"player_options"]);
player_options = ret.pointer_val; player_options = (Group *) ret.pointer_val;
} }
Menu_End (); Menu_End ();
@ -426,7 +426,7 @@ MENU_network_options (PLItem *plist)
if (plist) { if (plist) {
ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"network_options"]); ret = object_from_plist ([(PLDictionary*) plist getObjectForKey:"network_options"]);
network_options = ret.pointer_val; network_options = (Group *) ret.pointer_val;
} }
Menu_End (); Menu_End ();

2
ruamoko/cl_menu/plistmenu.r
View file

@ -103,7 +103,7 @@ array_from_plist (PLArray *plarray)
count = [plarray count]; count = [plarray count];
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
ret = object_from_plist ([plarray getObjectAtIndex:i]); ret = object_from_plist ([plarray getObjectAtIndex:i]);
[array addObject: ret.pointer_val]; [array addObject: (id) ret.pointer_val];
} }
ret.pointer_val = array; ret.pointer_val = array;
return ret; return ret;

2
ruamoko/scheme/Symbol.r
View file

@ -45,7 +45,7 @@ Symbol *symbol (string str)
{ {
local Symbol *res; local Symbol *res;
if ((res = Hash_Find (symbols, s))) { if ((res = (Symbol *) Hash_Find (symbols, s))) {
return res; return res;
} else { } else {
res = (Symbol*) [self newFromString: s]; res = (Symbol*) [self newFromString: s];