qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use the new file based property list API.

Browse source 
Also eleminate the menu_plist global (the plist does not hang around).
This commit is contained in:
Bill Currie 2010-11-24 13:15:19 +09:00
parent addbcaa09c
commit e471ddff47
3 changed files with 22 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ruamoko/cl_menu/client_menu.qc
View file

@ -123,15 +123,10 @@ integer save_cursor;
string (QFile f) get_comment =
{
local string line;
local string plist_data;
local PLItem plist;
local integer pos = Qtell (f);
plist_data = Qreadstring (f, Qfilesize (f) - pos);
plist = [PLItem newFromString:plist_data];
str_free (plist_data);
plist = [PLItem newFromFile:f];
line = [(PLString) [plist getObjectForKey:"comment"] string];
[plist release];
return line;
}

6
ruamoko/cl_menu/options.h
View file

@ -1,12 +1,6 @@
#ifndef __options_h
#define __options_h
@extern void () MENU_video_options;
@extern void () MENU_audio_options;
@extern void () MENU_control_options;
@extern void () MENU_feature_options;
@extern void () MENU_player_options;
@extern void () MENU_network_options;
@extern void () MENU_options;
@extern void (integer x, integer y, integer spacing, string label, string valstr) draw_val_item;

46
ruamoko/cl_menu/options.qc
View file

@ -45,8 +45,6 @@
#include "gui/Slider.h"
#include "gui/Text.h"
PLItem menu_plist;
Group video_options;
Group audio_options;
@ -234,7 +232,6 @@ object_from_plist (PLItem plist)
PLItem read_plist (void)
{
local string plist_data;
local QFile file;
local PLItem plist;
@ -243,10 +240,8 @@ PLItem read_plist (void)
dprint ("could not load menu.plist\n");
return NIL;
}
plist_data = Qreadstring (file, Qfilesize (file));
plist = [PLItem fromFile:file];
Qclose (file);
plist = [PLItem fromString:plist_data];
str_free (plist_data);
return plist;
}
@ -275,7 +270,7 @@ KEY_video_options =
Menu function for the video options menu.
*/
void ()
void (PLItem plist)
MENU_video_options =
{
local @param ret;
@ -284,8 +279,8 @@ MENU_video_options =
Menu_Draw (DRAW_video_options);
Menu_KeyEvent (KEY_video_options);
if (menu_plist) {
ret = object_from_plist ([menu_plist getObjectForKey:"video_options"]);
if (plist) {
ret = object_from_plist ([plist getObjectForKey:"video_options"]);
video_options = ret.pointer_val;
}
@ -322,7 +317,7 @@ KEY_audio_options =
Makes the audio menu
*/
void ()
void (PLItem plist)
MENU_audio_options =
{
local @param ret;
@ -331,8 +326,8 @@ MENU_audio_options =
Menu_Draw (DRAW_audio_options);
Menu_KeyEvent (KEY_audio_options);
if (menu_plist) {
ret = object_from_plist ([menu_plist getObjectForKey:"audio_options"]);
if (plist) {
ret = object_from_plist ([plist getObjectForKey:"audio_options"]);
audio_options = ret.pointer_val;
}
@ -406,7 +401,7 @@ KEY_control_options =
Menu make function for control options
*/
void ()
void (PLItem plist)
MENU_control_options =
{
local @param ret;
@ -415,8 +410,8 @@ MENU_control_options =
Menu_Draw (DRAW_control_options);
Menu_KeyEvent (KEY_control_options);
if (menu_plist) {
ret = object_from_plist ([menu_plist getObjectForKey:"control_options"]);
if (plist) {
ret = object_from_plist ([plist getObjectForKey:"control_options"]);
control_options = ret.pointer_val;
}
@ -470,7 +465,7 @@ DRAW_feature_options =
Makes the feature option menu
*/
void ()
void (PLItem plist)
MENU_feature_options =
{
local Rect rect;
@ -654,7 +649,7 @@ CB_ME_player_options =
Makes the player option menu
*/
void ()
void (PLItem plist)
MENU_player_options =
{
local Rect rect;
@ -824,7 +819,7 @@ CB_ME_network_options =
Makes the network option menu
*/
void ()
void (PLItem plist)
MENU_network_options =
{
local id view;
@ -885,8 +880,9 @@ void ()
MENU_options =
{
local integer spacing = 120;
local PLItem plist;
menu_plist = read_plist ();
plist = read_plist ();
Menu_Begin (54, 72, "");
Menu_FadeScreen (1);
@ -894,12 +890,12 @@ MENU_options =
Menu_CenterPic (160, 4, "gfx/p_option.lmp");
Menu_Item (54, 32, "Go to Console", op_goto_console, 0);
MENU_control_options ();
MENU_video_options ();
MENU_audio_options ();
MENU_feature_options ();
MENU_player_options ();
MENU_network_options ();
MENU_control_options (plist);
MENU_video_options (plist);
MENU_audio_options (plist);
MENU_feature_options (plist);
MENU_player_options (plist);
MENU_network_options (plist);
Menu_End ();
};