From da8636782451e77653c5301c02aa2a292c1229d1 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 29 Jul 2003 19:55:41 +0000 Subject: [PATCH] update for recent changes to Object --- ruamoko/cl_menu/Frame.h | 2 +- ruamoko/cl_menu/Frame.r | 6 +++--- ruamoko/cl_menu/HUD.h | 6 +++--- ruamoko/cl_menu/HUD.r | 20 ++++++++++---------- ruamoko/cl_menu/hud_interface.qc | 16 ++++++++-------- ruamoko/game/Axe.r | 2 +- ruamoko/lib/Array.r | 4 ++-- ruamoko/lib/List.r | 4 ++-- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ruamoko/cl_menu/Frame.h b/ruamoko/cl_menu/Frame.h index f02ecc34a..33ba3e432 100644 --- a/ruamoko/cl_menu/Frame.h +++ b/ruamoko/cl_menu/Frame.h @@ -7,7 +7,7 @@ float duration; } - (id) initWithFile: (string) file duration: (float) time; -- (void) free; +- (void) dealloc; - (Point) size; - (float) duration; - (void) draw: (integer) x :(integer) y; diff --git a/ruamoko/cl_menu/Frame.r b/ruamoko/cl_menu/Frame.r index 182c1e3e6..49127663d 100644 --- a/ruamoko/cl_menu/Frame.r +++ b/ruamoko/cl_menu/Frame.r @@ -11,10 +11,10 @@ return self; } -- (void) free +- (void) dealloc { - [picture free]; - [super free]; + [picture dealloc]; + [super dealloc]; } - (Point) size diff --git a/ruamoko/cl_menu/HUD.h b/ruamoko/cl_menu/HUD.h index 116201252..27673012f 100644 --- a/ruamoko/cl_menu/HUD.h +++ b/ruamoko/cl_menu/HUD.h @@ -11,7 +11,7 @@ + (void) initClass; - (id) initWithComponents: (integer) x : (integer) y; -- (void) free; +- (void) dealloc; - (integer) handle; - (Point) origin; - (Point) size; @@ -40,7 +40,7 @@ } - (id) initWithComponents: (integer)x :(integer)y :(string) _file; -- (void) free; +- (void) dealloc; - (Point) size; - (void) setFile: (string) _file; - (void) display; @@ -57,7 +57,7 @@ BOOL looping; } - (id) initWithComponents: (integer) x :(integer) y; -- (void) free; +- (void) dealloc; - (Point) size; - (void) addFrame: (Frame) frame; - (void) changeFrame; diff --git a/ruamoko/cl_menu/HUD.r b/ruamoko/cl_menu/HUD.r index f0eace1f3..fef55c3b0 100644 --- a/ruamoko/cl_menu/HUD.r +++ b/ruamoko/cl_menu/HUD.r @@ -23,11 +23,11 @@ integer HUDHandleClass; return self; } -- (void) free +- (void) dealloc { - [origin free]; + [origin dealloc]; GIB_Handle_Free (handle, HUDHandleClass); - [super free]; + [super dealloc]; } - (integer) handle @@ -110,10 +110,10 @@ integer HUDHandleClass; return self; } -- (void) free +- (void) dealloc { - [picture free]; - [super free]; + [picture dealloc]; + [super dealloc]; } - (Point) size @@ -123,7 +123,7 @@ integer HUDHandleClass; - (void) setFile: (string) _file { - [picture free]; + [picture dealloc]; picture = [[QPic alloc] initName :_file]; } @@ -147,10 +147,10 @@ integer HUDHandleClass; return self; } -- (void) free +- (void) dealloc { - [frames free]; - [super free]; + [frames dealloc]; + [super dealloc]; } - (Point) size diff --git a/ruamoko/cl_menu/hud_interface.qc b/ruamoko/cl_menu/hud_interface.qc index f360bedd1..6c753d051 100644 --- a/ruamoko/cl_menu/hud_interface.qc +++ b/ruamoko/cl_menu/hud_interface.qc @@ -76,7 +76,7 @@ void (integer argc, string [] argv) gib_hud_start_anim_f = for (i = 1; i < argc; i++) { anim = GIB_Handle_Get (stoi (argv[i]), HUDHandleClass); - if (anim && [anim isKindOf :[HUDAnimation class]]) + if (anim && [anim isKindOfClass :[HUDAnimation class]]) [anim start]; } }; @@ -91,7 +91,7 @@ void (integer argc, string [] argv) gib_hud_stop_anim_f = for (i = 1; i < argc; i++) { anim = GIB_Handle_Get (stoi (argv[i]), HUDHandleClass); - if (anim && [anim isKindOf :[HUDAnimation class]]) + if (anim && [anim isKindOfClass :[HUDAnimation class]]) [anim stop]; } }; @@ -104,7 +104,7 @@ void (integer argc, string [] argv) gib_hud_set_looping_f = return; anim = GIB_Handle_Get (stoi (argv[1]), HUDHandleClass); - if (anim && [anim isKindOf :[HUDAnimation class]]) { + if (anim && [anim isKindOfClass :[HUDAnimation class]]) { switch (argv[2]) { case "yes": case "true": @@ -132,7 +132,7 @@ void (integer argc, string [] argv) gib_hud_delete_f = trashObject = GIB_Handle_Get (stoi (argv[i]), HUDHandleClass); if (trashObject) { [HUDObjects removeItem :trashObject]; - [trashObject free]; + [trashObject dealloc]; } else dprint (sprintf ("Warning: no HUD object associated with handle %i\n", stoi (argv[i]))); } @@ -156,7 +156,7 @@ void (integer argc, string [] argv) gib_hud_get_rect_f = myPoint = [myObject size]; GIB_Return (itos ([myPoint x])); GIB_Return (itos ([myPoint y])); - [myPoint free]; + [myPoint dealloc]; }; @@ -176,7 +176,7 @@ void (integer argc, string [] argv) gib_hud_set_translate_f = else for (i = 1; i < argc - 2; i++) [(HUDObject) GIB_Handle_Get (stoi (argv[i]), HUDHandleClass) setOrigin :p]; - [p free]; + [p dealloc]; }; void (integer argc, string [] argv) gib_hud_set_text_f = @@ -187,7 +187,7 @@ void (integer argc, string [] argv) gib_hud_set_text_f = return; myObject = GIB_Handle_Get (stoi (argv[1]), HUDHandleClass); - if (!myObject || ![myObject isKindOf :[HUDText class]]) + if (!myObject || ![myObject isKindOfClass :[HUDText class]]) return; [myObject setText :argv[2]]; }; @@ -200,7 +200,7 @@ void (integer argc, string [] argv) gib_hud_set_file_f = return; myObject = GIB_Handle_Get (stoi (argv[1]), HUDHandleClass); - if (!myObject || ![myObject isKindOf :[HUDGraphic class]]) + if (!myObject || ![myObject isKindOfClass :[HUDGraphic class]]) return; [myObject setFile :argv[2]]; }; diff --git a/ruamoko/game/Axe.r b/ruamoko/game/Axe.r index 6ce6d31ee..9aecc7d93 100644 --- a/ruamoko/game/Axe.r +++ b/ruamoko/game/Axe.r @@ -37,7 +37,7 @@ org = trace_endpos - v_forward * 4; - if ([trace_ent.@this takeDamage: self inflictor: s attacker: s : damage]) + if ([trace_ent.@this takeDamage:self :s :s :damage]) SpawnBlood (org, 20); else { sound (s, CHAN_WEAPON, "player/axhit2.wav", 1, ATTN_NORM); diff --git a/ruamoko/lib/Array.r b/ruamoko/lib/Array.r index 7dd3f5428..122c55a7c 100644 --- a/ruamoko/lib/Array.r +++ b/ruamoko/lib/Array.r @@ -110,14 +110,14 @@ { local integer i; for (i = 0; i < count; i++) - [array[i] perform:selector]; + [array[i] performSelector:selector]; } -(void)makeObjectsPerformSelector:(SEL)selector withObject:(id)arg { local integer i; for (i = 0; i < count; i++) - [array[i] perform:selector withObject:arg]; + [array[i] performSelector:selector withObject:arg]; } @end diff --git a/ruamoko/lib/List.r b/ruamoko/lib/List.r index 9bdc53b9f..de79defaa 100644 --- a/ruamoko/lib/List.r +++ b/ruamoko/lib/List.r @@ -125,14 +125,14 @@ { local list_bucket_t [] e; for (e = head; e; e = e.next) - [e.obj perform:selector]; + [e.obj performSelector:selector]; } -(void)makeObjectsPerformSelector:(SEL)selector withObject:(id)arg { local list_bucket_t [] e; for (e = head; e; e = e.next) - [e.obj perform:selector withObject:arg]; + [e.obj performSelector:selector withObject:arg]; } @end