From 1217fce596f1b9769ffb6f479e3abbd4f77af5ef Mon Sep 17 00:00:00 2001 From: TimePath Date: Sat, 22 Aug 2015 15:40:30 +1000 Subject: [PATCH] Require semicolon or definition following `METHOD` --- qcsrc/common/buffs.qh | 2 +- qcsrc/common/items/item.qh | 2 +- qcsrc/common/items/item/pickup.qh | 4 +- qcsrc/common/oo.qh | 3 +- qcsrc/menu/anim/animation.qc | 26 +++++----- qcsrc/menu/anim/animhost.qc | 22 ++++---- qcsrc/menu/anim/easing.qc | 4 +- qcsrc/menu/anim/keyframe.qc | 6 +-- qcsrc/menu/item.qc | 30 +++++------ qcsrc/menu/item/borderimage.qc | 8 +-- qcsrc/menu/item/button.qc | 18 +++---- qcsrc/menu/item/checkbox.qc | 10 ++-- qcsrc/menu/item/container.qc | 50 +++++++++---------- qcsrc/menu/item/dialog.qc | 24 ++++----- qcsrc/menu/item/image.qc | 18 +++---- qcsrc/menu/item/inputbox.qc | 22 ++++---- qcsrc/menu/item/inputcontainer.qc | 16 +++--- qcsrc/menu/item/label.qc | 12 ++--- qcsrc/menu/item/listbox.qc | 42 ++++++++-------- qcsrc/menu/item/modalcontroller.qc | 18 +++---- qcsrc/menu/item/nexposee.qc | 28 +++++------ qcsrc/menu/item/radiobutton.qc | 2 +- qcsrc/menu/item/slider.qc | 28 +++++------ qcsrc/menu/item/textslider.qc | 16 +++--- qcsrc/menu/xonotic/bigbutton.qc | 2 +- qcsrc/menu/xonotic/bigcommandbutton.qc | 2 +- qcsrc/menu/xonotic/button.qc | 2 +- qcsrc/menu/xonotic/campaign.qc | 22 ++++---- qcsrc/menu/xonotic/charmap.qc | 16 +++--- qcsrc/menu/xonotic/checkbox.qc | 8 +-- qcsrc/menu/xonotic/checkbox_slider_invalid.qc | 6 +-- qcsrc/menu/xonotic/checkbox_string.qc | 8 +-- qcsrc/menu/xonotic/colorbutton.qc | 10 ++-- qcsrc/menu/xonotic/colorpicker.qc | 14 +++--- qcsrc/menu/xonotic/colorpicker_string.qc | 14 +++--- qcsrc/menu/xonotic/commandbutton.qc | 2 +- qcsrc/menu/xonotic/credits.qc | 12 ++--- qcsrc/menu/xonotic/crosshairpicker.qc | 8 +-- qcsrc/menu/xonotic/crosshairpreview.qc | 4 +- qcsrc/menu/xonotic/cvarlist.qc | 16 +++--- qcsrc/menu/xonotic/demolist.qc | 22 ++++---- qcsrc/menu/xonotic/dialog.qc | 2 +- qcsrc/menu/xonotic/dialog_credits.qc | 4 +- qcsrc/menu/xonotic/dialog_firstrun.qc | 2 +- qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc | 2 +- .../xonotic/dialog_hudpanel_centerprint.qc | 2 +- qcsrc/menu/xonotic/dialog_hudpanel_chat.qc | 2 +- .../xonotic/dialog_hudpanel_engineinfo.qc | 2 +- .../xonotic/dialog_hudpanel_healtharmor.qc | 2 +- .../xonotic/dialog_hudpanel_infomessages.qc | 2 +- .../menu/xonotic/dialog_hudpanel_itemstime.qc | 2 +- .../menu/xonotic/dialog_hudpanel_modicons.qc | 2 +- .../xonotic/dialog_hudpanel_notification.qc | 2 +- qcsrc/menu/xonotic/dialog_hudpanel_physics.qc | 2 +- .../menu/xonotic/dialog_hudpanel_powerups.qc | 2 +- .../xonotic/dialog_hudpanel_pressedkeys.qc | 2 +- .../menu/xonotic/dialog_hudpanel_racetimer.qc | 2 +- qcsrc/menu/xonotic/dialog_hudpanel_radar.qc | 2 +- qcsrc/menu/xonotic/dialog_hudpanel_score.qc | 2 +- qcsrc/menu/xonotic/dialog_hudpanel_timer.qc | 2 +- qcsrc/menu/xonotic/dialog_hudpanel_vote.qc | 2 +- qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc | 2 +- qcsrc/menu/xonotic/dialog_hudsetup_exit.qc | 2 +- qcsrc/menu/xonotic/dialog_monstertools.qc | 2 +- qcsrc/menu/xonotic/dialog_multiplayer.qc | 2 +- .../menu/xonotic/dialog_multiplayer_create.qc | 6 +-- .../dialog_multiplayer_create_mapinfo.qc | 4 +- .../dialog_multiplayer_create_mutators.qc | 8 +-- qcsrc/menu/xonotic/dialog_multiplayer_join.qc | 2 +- .../dialog_multiplayer_join_serverinfo.qc | 4 +- .../menu/xonotic/dialog_multiplayer_media.qc | 2 +- .../xonotic/dialog_multiplayer_media_demo.qc | 2 +- ...log_multiplayer_media_demo_startconfirm.qc | 2 +- ...alog_multiplayer_media_demo_timeconfirm.qc | 2 +- .../dialog_multiplayer_media_musicplayer.qc | 2 +- .../dialog_multiplayer_media_screenshot.qc | 4 +- ...log_multiplayer_media_screenshot_viewer.qc | 8 +-- .../xonotic/dialog_multiplayer_profile.qc | 4 +- qcsrc/menu/xonotic/dialog_quit.qc | 2 +- qcsrc/menu/xonotic/dialog_sandboxtools.qc | 2 +- qcsrc/menu/xonotic/dialog_settings.qc | 2 +- qcsrc/menu/xonotic/dialog_settings_audio.qc | 2 +- qcsrc/menu/xonotic/dialog_settings_effects.qc | 2 +- qcsrc/menu/xonotic/dialog_settings_game.qc | 2 +- .../xonotic/dialog_settings_game_crosshair.qc | 4 +- .../menu/xonotic/dialog_settings_game_hud.qc | 4 +- .../dialog_settings_game_hudconfirm.qc | 2 +- .../xonotic/dialog_settings_game_messages.qc | 4 +- .../xonotic/dialog_settings_game_model.qc | 4 +- .../menu/xonotic/dialog_settings_game_view.qc | 4 +- .../xonotic/dialog_settings_game_weapons.qc | 4 +- qcsrc/menu/xonotic/dialog_settings_input.qc | 2 +- .../xonotic/dialog_settings_input_userbind.qc | 4 +- qcsrc/menu/xonotic/dialog_settings_misc.qc | 2 +- .../xonotic/dialog_settings_misc_cvars.qc | 4 +- .../xonotic/dialog_settings_misc_reset.qc | 2 +- qcsrc/menu/xonotic/dialog_settings_user.qc | 2 +- .../dialog_settings_user_languagewarning.qc | 2 +- qcsrc/menu/xonotic/dialog_settings_video.qc | 2 +- qcsrc/menu/xonotic/dialog_singleplayer.qc | 2 +- .../xonotic/dialog_singleplayer_winner.qc | 4 +- qcsrc/menu/xonotic/dialog_teamselect.qc | 4 +- qcsrc/menu/xonotic/gametypebutton.qc | 8 +-- qcsrc/menu/xonotic/gametypelist.qc | 16 +++--- qcsrc/menu/xonotic/image.qc | 2 +- qcsrc/menu/xonotic/inputbox.qc | 12 ++--- qcsrc/menu/xonotic/keybinder.qc | 16 +++--- qcsrc/menu/xonotic/languagelist.qc | 24 ++++----- qcsrc/menu/xonotic/listbox.qc | 4 +- qcsrc/menu/xonotic/mainwindow.qc | 4 +- qcsrc/menu/xonotic/maplist.qc | 26 +++++----- qcsrc/menu/xonotic/nexposee.qc | 4 +- qcsrc/menu/xonotic/picker.qc | 22 ++++---- qcsrc/menu/xonotic/playerlist.qc | 8 +-- qcsrc/menu/xonotic/playermodel.qc | 16 +++--- qcsrc/menu/xonotic/playlist.qc | 28 +++++------ qcsrc/menu/xonotic/radiobutton.qc | 10 ++-- qcsrc/menu/xonotic/rootdialog.qc | 2 +- qcsrc/menu/xonotic/screenshotimage.qc | 14 +++--- qcsrc/menu/xonotic/screenshotlist.qc | 32 ++++++------ qcsrc/menu/xonotic/serverlist.qc | 32 ++++++------ qcsrc/menu/xonotic/skinlist.qc | 22 ++++---- qcsrc/menu/xonotic/slider.qc | 8 +-- qcsrc/menu/xonotic/slider_decibels.qc | 6 +-- qcsrc/menu/xonotic/slider_particles.qc | 6 +-- qcsrc/menu/xonotic/slider_picmip.qc | 6 +-- qcsrc/menu/xonotic/slider_resolution.qc | 12 ++--- qcsrc/menu/xonotic/slider_sbfadetime.qc | 6 +-- qcsrc/menu/xonotic/soundlist.qc | 18 +++---- qcsrc/menu/xonotic/statslist.qc | 16 +++--- qcsrc/menu/xonotic/tab.qc | 2 +- qcsrc/menu/xonotic/tabcontroller.qc | 4 +- qcsrc/menu/xonotic/textlabel.qc | 4 +- qcsrc/menu/xonotic/textslider.qc | 10 ++-- qcsrc/menu/xonotic/weaponarenacheckbox.qc | 8 +-- qcsrc/menu/xonotic/weaponslist.qc | 14 +++--- 136 files changed, 585 insertions(+), 584 deletions(-) diff --git a/qcsrc/common/buffs.qh b/qcsrc/common/buffs.qh index db5794324..ddf572281 100644 --- a/qcsrc/common/buffs.qh +++ b/qcsrc/common/buffs.qh @@ -34,7 +34,7 @@ CLASS(Buff, Pickup) ATTRIB(Buff, m_skin, int, 0) ATTRIB(Buff, m_sprite, string, "") #ifdef SVQC - METHOD(Buff, m_time, float(entity)) + METHOD(Buff, m_time, float(entity)); float Buff_m_time(entity this) { return cvar(strcat("g_buffs_", this.netname, "_time")); } #endif ENDCLASS(Buff) diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh index 6ecd6d7f7..0b17f35b2 100644 --- a/qcsrc/common/items/item.qh +++ b/qcsrc/common/items/item.qh @@ -5,7 +5,7 @@ /** If you register a new item, make sure to add it to all.inc */ CLASS(GameItem, Object) ATTRIB(GameItem, m_id, int, 0) - METHOD(GameItem, show, void(entity this)) + METHOD(GameItem, show, void(entity this)); void GameItem_show(entity this) { print("A game item\n"); } void ITEM_HANDLE(Show, entity this) { this.show(this); } ENDCLASS(GameItem) diff --git a/qcsrc/common/items/item/pickup.qh b/qcsrc/common/items/item/pickup.qh index 1875517f1..643617068 100644 --- a/qcsrc/common/items/item/pickup.qh +++ b/qcsrc/common/items/item/pickup.qh @@ -5,7 +5,7 @@ CLASS(Pickup, GameItem) ATTRIB(Pickup, m_model, string, string_null) ATTRIB(Pickup, m_sound, string, "misc/itempickup.wav") ATTRIB(Pickup, m_name, string, string_null) - METHOD(Pickup, show, void(entity this)) + METHOD(Pickup, show, void(entity this)); void Pickup_show(entity this) { printf("%s: %s\n", etos(this), this.m_name); } #ifdef SVQC ATTRIB(Pickup, m_botvalue, int, 0) @@ -14,7 +14,7 @@ CLASS(Pickup, GameItem) ATTRIB(Pickup, m_pickupevalfunc, float(entity player, entity item), generic_pickupevalfunc) ATTRIB(Pickup, m_respawntime, float(), func_null) ATTRIB(Pickup, m_respawntimejitter, float(), func_null) - METHOD(Pickup, giveTo, bool(entity this, entity item, entity player)) + METHOD(Pickup, giveTo, bool(entity this, entity item, entity player)); bool Pickup_giveTo(entity this, entity item, entity player) { return Item_GiveTo(item, player); } bool ITEM_HANDLE(Pickup, entity this, entity item, entity player); #endif diff --git a/qcsrc/common/oo.qh b/qcsrc/common/oo.qh index aa660ab15..add63b0cd 100644 --- a/qcsrc/common/oo.qh +++ b/qcsrc/common/oo.qh @@ -97,7 +97,8 @@ ACCUMULATE_FUNCTION(__static_init, RegisterClasses) #define METHOD(cname, name, prototype) \ class(cname) .prototype name; \ prototype cname##_##name; \ - INIT_STATIC(cname) { this.name = cname##_##name; } + INIT_STATIC(cname) { this.name = cname##_##name; } \ + prototype cname##_##name #define ATTRIB(cname, name, type, val) \ class(cname) .type name; \ diff --git a/qcsrc/menu/anim/animation.qc b/qcsrc/menu/anim/animation.qc index 3039d85b8..d52ae4f71 100644 --- a/qcsrc/menu/anim/animation.qc +++ b/qcsrc/menu/anim/animation.qc @@ -3,19 +3,19 @@ #include "../oo/base.qh" void setterDummy(entity, float); CLASS(Animation, Object) - METHOD(Animation, configureAnimation, void(entity, entity, void(entity, float), float, float, float, float)) - METHOD(Animation, setTimeStartEnd, void(entity, float, float)) - METHOD(Animation, setTimeStartDuration, void(entity, float, float)) - METHOD(Animation, setValueStartEnd, void(entity, float, float)) - METHOD(Animation, setValueStartDelta, void(entity, float, float)) - METHOD(Animation, setObjectSetter, void(entity, entity, void(entity, float))) - METHOD(Animation, tick, void(entity, float)) - METHOD(Animation, calcValue, float(entity, float, float, float, float)) - METHOD(Animation, isStopped, float(entity)) - METHOD(Animation, stopAnim, void(entity)) - METHOD(Animation, resumeAnim, void(entity)) - METHOD(Animation, isFinished, float(entity)) - METHOD(Animation, finishAnim, void(entity)) + METHOD(Animation, configureAnimation, void(entity, entity, void(entity, float), float, float, float, float)); + METHOD(Animation, setTimeStartEnd, void(entity, float, float)); + METHOD(Animation, setTimeStartDuration, void(entity, float, float)); + METHOD(Animation, setValueStartEnd, void(entity, float, float)); + METHOD(Animation, setValueStartDelta, void(entity, float, float)); + METHOD(Animation, setObjectSetter, void(entity, entity, void(entity, float))); + METHOD(Animation, tick, void(entity, float)); + METHOD(Animation, calcValue, float(entity, float, float, float, float)); + METHOD(Animation, isStopped, float(entity)); + METHOD(Animation, stopAnim, void(entity)); + METHOD(Animation, resumeAnim, void(entity)); + METHOD(Animation, isFinished, float(entity)); + METHOD(Animation, finishAnim, void(entity)); ATTRIB(Animation, object, entity, NULL) ATTRIB(Animation, setter, void(entity, float), setterDummy) ATTRIB(Animation, value, float, 0) diff --git a/qcsrc/menu/anim/animhost.qc b/qcsrc/menu/anim/animhost.qc index 61a040cff..4489de3d5 100644 --- a/qcsrc/menu/anim/animhost.qc +++ b/qcsrc/menu/anim/animhost.qc @@ -4,17 +4,17 @@ #define ANIM_ANIMHOST_H #include "../oo/base.qh" CLASS(AnimHost, Object) - METHOD(AnimHost, addAnim, void(entity, entity)) - METHOD(AnimHost, removeAnim, void(entity, entity)) - METHOD(AnimHost, removeAllAnim, void(entity)) - METHOD(AnimHost, removeObjAnim, void(entity, entity)) - METHOD(AnimHost, stopAllAnim, void(entity)) - METHOD(AnimHost, stopObjAnim, void(entity, entity)) - METHOD(AnimHost, resumeAllAnim, void(entity)) - METHOD(AnimHost, resumeObjAnim, void(entity, entity)) - METHOD(AnimHost, finishAllAnim, void(entity)) - METHOD(AnimHost, finishObjAnim, void(entity, entity)) - METHOD(AnimHost, tickAll, void(entity)) + METHOD(AnimHost, addAnim, void(entity, entity)); + METHOD(AnimHost, removeAnim, void(entity, entity)); + METHOD(AnimHost, removeAllAnim, void(entity)); + METHOD(AnimHost, removeObjAnim, void(entity, entity)); + METHOD(AnimHost, stopAllAnim, void(entity)); + METHOD(AnimHost, stopObjAnim, void(entity, entity)); + METHOD(AnimHost, resumeAllAnim, void(entity)); + METHOD(AnimHost, resumeObjAnim, void(entity, entity)); + METHOD(AnimHost, finishAllAnim, void(entity)); + METHOD(AnimHost, finishObjAnim, void(entity, entity)); + METHOD(AnimHost, tickAll, void(entity)); ATTRIB(AnimHost, firstChild, entity, NULL) ATTRIB(AnimHost, lastChild, entity, NULL) ENDCLASS(AnimHost) diff --git a/qcsrc/menu/anim/easing.qc b/qcsrc/menu/anim/easing.qc index fe4c0fb65..f1962719f 100644 --- a/qcsrc/menu/anim/easing.qc +++ b/qcsrc/menu/anim/easing.qc @@ -8,8 +8,8 @@ float easingQuadIn(float, float, float, float); float easingQuadOut(float, float, float, float); float easingQuadInOut(float, float, float, float); CLASS(Easing, Animation) - METHOD(Easing, calcValue, float(entity, float, float, float, float)) - METHOD(Easing, setMath, void(entity, float(float, float, float, float))) + METHOD(Easing, calcValue, float(entity, float, float, float, float)); + METHOD(Easing, setMath, void(entity, float(float, float, float, float))); ATTRIB(Easing, math, float(float, float, float, float), easingLinear) ENDCLASS(Easing) #endif diff --git a/qcsrc/menu/anim/keyframe.qc b/qcsrc/menu/anim/keyframe.qc index d310ef72c..d83a2cbd4 100644 --- a/qcsrc/menu/anim/keyframe.qc +++ b/qcsrc/menu/anim/keyframe.qc @@ -2,9 +2,9 @@ #define ANIM_KEYFRAME_H #include "animation.qc" CLASS(Keyframe, Animation) - METHOD(Keyframe, addEasing, entity(entity, float, float, float(float, float, float, float))) - METHOD(Keyframe, addAnim, void(entity, entity)) - METHOD(Keyframe, calcValue, float(entity, float, float, float, float)) + METHOD(Keyframe, addEasing, entity(entity, float, float, float(float, float, float, float))); + METHOD(Keyframe, addAnim, void(entity, entity)); + METHOD(Keyframe, calcValue, float(entity, float, float, float, float)); ATTRIB(Keyframe, currentChild, entity, NULL) ATTRIB(Keyframe, firstChild, entity, NULL) ATTRIB(Keyframe, lastChild, entity, NULL) diff --git a/qcsrc/menu/item.qc b/qcsrc/menu/item.qc index cb24866d1..8788f2e84 100644 --- a/qcsrc/menu/item.qc +++ b/qcsrc/menu/item.qc @@ -3,21 +3,21 @@ #include "skin.qh" #include "oo/base.qh" CLASS(Item, Object) - METHOD(Item, draw, void(entity)) - METHOD(Item, keyDown, float(entity, float, float, float)) - METHOD(Item, keyUp, float(entity, float, float, float)) - METHOD(Item, mouseMove, float(entity, vector)) - METHOD(Item, mousePress, float(entity, vector)) - METHOD(Item, mouseDrag, float(entity, vector)) - METHOD(Item, mouseRelease, float(entity, vector)) - METHOD(Item, focusEnter, void(entity)) - METHOD(Item, focusLeave, void(entity)) - METHOD(Item, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(Item, relinquishFocus, void(entity)) - METHOD(Item, showNotify, void(entity)) - METHOD(Item, hideNotify, void(entity)) - METHOD(Item, toString, string(entity)) - METHOD(Item, destroy, void(entity)) + METHOD(Item, draw, void(entity)); + METHOD(Item, keyDown, float(entity, float, float, float)); + METHOD(Item, keyUp, float(entity, float, float, float)); + METHOD(Item, mouseMove, float(entity, vector)); + METHOD(Item, mousePress, float(entity, vector)); + METHOD(Item, mouseDrag, float(entity, vector)); + METHOD(Item, mouseRelease, float(entity, vector)); + METHOD(Item, focusEnter, void(entity)); + METHOD(Item, focusLeave, void(entity)); + METHOD(Item, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(Item, relinquishFocus, void(entity)); + METHOD(Item, showNotify, void(entity)); + METHOD(Item, hideNotify, void(entity)); + METHOD(Item, toString, string(entity)); + METHOD(Item, destroy, void(entity)); ATTRIB(Item, focused, float, 0) ATTRIB(Item, focusable, float, 0) ATTRIB(Item, allowFocusSound, float, 0) diff --git a/qcsrc/menu/item/borderimage.qc b/qcsrc/menu/item/borderimage.qc index 6b6f4693d..bcbd408ed 100644 --- a/qcsrc/menu/item/borderimage.qc +++ b/qcsrc/menu/item/borderimage.qc @@ -2,11 +2,11 @@ #define ITEM_BORDERIMAGE_H #include "label.qc" CLASS(BorderImage, Label) - METHOD(BorderImage, configureBorderImage, void(entity, string, float, vector, string, float)) - METHOD(BorderImage, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(BorderImage, recalcPositionWithText, void(entity, string)) + METHOD(BorderImage, configureBorderImage, void(entity, string, float, vector, string, float)); + METHOD(BorderImage, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(BorderImage, recalcPositionWithText, void(entity, string)); ATTRIB(BorderImage, isBold, float, 1) - METHOD(BorderImage, draw, void(entity)) + METHOD(BorderImage, draw, void(entity)); ATTRIB(BorderImage, src, string, string_null) ATTRIB(BorderImage, borderHeight, float, 0) ATTRIB(BorderImage, borderVec, vector, '0 0 0') diff --git a/qcsrc/menu/item/button.qc b/qcsrc/menu/item/button.qc index 796ce40a3..343bf1d93 100644 --- a/qcsrc/menu/item/button.qc +++ b/qcsrc/menu/item/button.qc @@ -2,15 +2,15 @@ #define ITEM_BUTTON_H #include "label.qc" CLASS(Button, Label) - METHOD(Button, configureButton, void(entity, string, float, string)) - METHOD(Button, draw, void(entity)) - METHOD(Button, showNotify, void(entity)) - METHOD(Button, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(Button, keyDown, float(entity, float, float, float)) - METHOD(Button, mousePress, float(entity, vector)) - METHOD(Button, mouseDrag, float(entity, vector)) - METHOD(Button, mouseRelease, float(entity, vector)) - METHOD(Button, playClickSound, void(entity)) + METHOD(Button, configureButton, void(entity, string, float, string)); + METHOD(Button, draw, void(entity)); + METHOD(Button, showNotify, void(entity)); + METHOD(Button, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(Button, keyDown, float(entity, float, float, float)); + METHOD(Button, mousePress, float(entity, vector)); + METHOD(Button, mouseDrag, float(entity, vector)); + METHOD(Button, mouseRelease, float(entity, vector)); + METHOD(Button, playClickSound, void(entity)); ATTRIB(Button, onClick, void(entity, entity), func_null) ATTRIB(Button, onClickEntity, entity, NULL) ATTRIB(Button, src, string, string_null) diff --git a/qcsrc/menu/item/checkbox.qc b/qcsrc/menu/item/checkbox.qc index e8b4e15e3..cda07c518 100644 --- a/qcsrc/menu/item/checkbox.qc +++ b/qcsrc/menu/item/checkbox.qc @@ -3,11 +3,11 @@ #include "button.qc" void CheckBox_Click(entity me, entity other); CLASS(CheckBox, Button) - METHOD(CheckBox, configureCheckBox, void(entity, string, float, string)) - METHOD(CheckBox, draw, void(entity)) - METHOD(CheckBox, playClickSound, void(entity)) - METHOD(CheckBox, toString, string(entity)) - METHOD(CheckBox, setChecked, void(entity, float)) + METHOD(CheckBox, configureCheckBox, void(entity, string, float, string)); + METHOD(CheckBox, draw, void(entity)); + METHOD(CheckBox, playClickSound, void(entity)); + METHOD(CheckBox, toString, string(entity)); + METHOD(CheckBox, setChecked, void(entity, float)); ATTRIB(CheckBox, useDownAsChecked, float, 0) ATTRIB(CheckBox, checked, float, 0) ATTRIB(CheckBox, onClick, void(entity, entity), CheckBox_Click) diff --git a/qcsrc/menu/item/container.qc b/qcsrc/menu/item/container.qc index ac0655cfa..cacb0124a 100644 --- a/qcsrc/menu/item/container.qc +++ b/qcsrc/menu/item/container.qc @@ -2,28 +2,28 @@ #define ITEM_CONTAINER_H #include "../item.qc" CLASS(Container, Item) - METHOD(Container, draw, void(entity)) - METHOD(Container, keyUp, float(entity, float, float, float)) - METHOD(Container, keyDown, float(entity, float, float, float)) - METHOD(Container, mouseMove, float(entity, vector)) - METHOD(Container, mousePress, float(entity, vector)) - METHOD(Container, mouseDrag, float(entity, vector)) - METHOD(Container, mouseRelease, float(entity, vector)) - METHOD(Container, focusLeave, void(entity)) - METHOD(Container, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(Container, resizeNotifyLie, void(entity, vector, vector, vector, vector, .vector, .vector, .vector)) - METHOD(Container, addItem, void(entity, entity, vector, vector, float)) - METHOD(Container, addItemCentered, void(entity, entity, vector, float)) - METHOD(Container, addItemRightCentered, void(entity, entity, vector, float)) - METHOD(Container, moveItemAfter, void(entity, entity, entity)) - METHOD(Container, removeItem, void(entity, entity)) - METHOD(Container, setFocus, void(entity, entity)) - METHOD(Container, saveFocus, void(entity)) - METHOD(Container, setAlphaOf, void(entity, entity, float)) - METHOD(Container, itemFromPoint, entity(entity, vector)) - METHOD(Container, showNotify, void(entity)) - METHOD(Container, hideNotify, void(entity)) - METHOD(Container, preferredFocusedGrandChild, entity(entity)) + METHOD(Container, draw, void(entity)); + METHOD(Container, keyUp, float(entity, float, float, float)); + METHOD(Container, keyDown, float(entity, float, float, float)); + METHOD(Container, mouseMove, float(entity, vector)); + METHOD(Container, mousePress, float(entity, vector)); + METHOD(Container, mouseDrag, float(entity, vector)); + METHOD(Container, mouseRelease, float(entity, vector)); + METHOD(Container, focusLeave, void(entity)); + METHOD(Container, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(Container, resizeNotifyLie, void(entity, vector, vector, vector, vector, .vector, .vector, .vector)); + METHOD(Container, addItem, void(entity, entity, vector, vector, float)); + METHOD(Container, addItemCentered, void(entity, entity, vector, float)); + METHOD(Container, addItemRightCentered, void(entity, entity, vector, float)); + METHOD(Container, moveItemAfter, void(entity, entity, entity)); + METHOD(Container, removeItem, void(entity, entity)); + METHOD(Container, setFocus, void(entity, entity)); + METHOD(Container, saveFocus, void(entity)); + METHOD(Container, setAlphaOf, void(entity, entity, float)); + METHOD(Container, itemFromPoint, entity(entity, vector)); + METHOD(Container, showNotify, void(entity)); + METHOD(Container, hideNotify, void(entity)); + METHOD(Container, preferredFocusedGrandChild, entity(entity)); ATTRIB(Container, focusable, float, 0) ATTRIB(Container, firstChild, entity, NULL) ATTRIB(Container, lastChild, entity, NULL) @@ -31,9 +31,9 @@ CLASS(Container, Item) ATTRIB(Container, savedFocus, entity, NULL) ATTRIB(Container, shown, float, 0) - METHOD(Container, enterSubitem, void(entity, entity)) - METHOD(Container, enterLieSubitem, void(entity, vector, vector, vector, float)) - METHOD(Container, leaveSubitem, void(entity)) + METHOD(Container, enterSubitem, void(entity, entity)); + METHOD(Container, enterLieSubitem, void(entity, vector, vector, vector, float)); + METHOD(Container, leaveSubitem, void(entity)); ENDCLASS(Container) .entity nextSibling; .entity prevSibling; diff --git a/qcsrc/menu/item/dialog.qc b/qcsrc/menu/item/dialog.qc index 77037ace6..f02be5b53 100644 --- a/qcsrc/menu/item/dialog.qc +++ b/qcsrc/menu/item/dialog.qc @@ -17,18 +17,18 @@ #define ITEM_DIALOG_H #include "inputcontainer.qc" CLASS(Dialog, InputContainer) - METHOD(Dialog, configureDialog, void(entity)) // no runtime configuration, all parameters are given in the code! - METHOD(Dialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls - METHOD(Dialog, keyDown, float(entity, float, float, float)) - METHOD(Dialog, close, void(entity)) - METHOD(Dialog, addItemSimple, void(entity, float, float, float, float, entity, vector)) - - METHOD(Dialog, TD, void(entity, float, float, entity)) - METHOD(Dialog, TDNoMargin, void(entity, float, float, entity, vector)) - METHOD(Dialog, TDempty, void(entity, float)) - METHOD(Dialog, setFirstColumn, void(entity, float)) - METHOD(Dialog, TR, void(entity)) - METHOD(Dialog, gotoRC, void(entity, float, float)) + METHOD(Dialog, configureDialog, void(entity)); // no runtime configuration, all parameters are given in the code! + METHOD(Dialog, fill, void(entity)); // to be overridden by user to fill the dialog with controls + METHOD(Dialog, keyDown, float(entity, float, float, float)); + METHOD(Dialog, close, void(entity)); + METHOD(Dialog, addItemSimple, void(entity, float, float, float, float, entity, vector)); + + METHOD(Dialog, TD, void(entity, float, float, entity)); + METHOD(Dialog, TDNoMargin, void(entity, float, float, entity, vector)); + METHOD(Dialog, TDempty, void(entity, float)); + METHOD(Dialog, setFirstColumn, void(entity, float)); + METHOD(Dialog, TR, void(entity)); + METHOD(Dialog, gotoRC, void(entity, float, float)); ATTRIB(Dialog, isTabRoot, float, 1) ATTRIB(Dialog, closeButton, entity, NULL) diff --git a/qcsrc/menu/item/image.qc b/qcsrc/menu/item/image.qc index 7756b4991..baa5d6157 100644 --- a/qcsrc/menu/item/image.qc +++ b/qcsrc/menu/item/image.qc @@ -2,15 +2,15 @@ #define ITEM_IMAGE_H #include "../item.qc" CLASS(Image, Item) - METHOD(Image, configureImage, void(entity, string)) - METHOD(Image, draw, void(entity)) - METHOD(Image, toString, string(entity)) - METHOD(Image, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(Image, updateAspect, void(entity)) - METHOD(Image, initZoom, void(entity)) - METHOD(Image, setZoom, void(entity, float, float)) - METHOD(Image, drag_setStartPos, float(entity, vector)) - METHOD(Image, drag, float(entity, vector)) + METHOD(Image, configureImage, void(entity, string)); + METHOD(Image, draw, void(entity)); + METHOD(Image, toString, string(entity)); + METHOD(Image, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(Image, updateAspect, void(entity)); + METHOD(Image, initZoom, void(entity)); + METHOD(Image, setZoom, void(entity, float, float)); + METHOD(Image, drag_setStartPos, float(entity, vector)); + METHOD(Image, drag, float(entity, vector)); ATTRIB(Image, src, string, string_null) ATTRIB(Image, color, vector, '1 1 1') ATTRIB(Image, forcedAspect, float, 0) // special values: -1 keep image aspect ratio, -2 keep image size but bound to the containing box, -3 always keep image size diff --git a/qcsrc/menu/item/inputbox.qc b/qcsrc/menu/item/inputbox.qc index 5bcfd5f9c..35ffe44d8 100644 --- a/qcsrc/menu/item/inputbox.qc +++ b/qcsrc/menu/item/inputbox.qc @@ -2,17 +2,17 @@ #define ITEM_INPUTBOX_H #include "label.qc" CLASS(InputBox, Label) - METHOD(InputBox, configureInputBox, void(entity, string, float, float, string)) - METHOD(InputBox, draw, void(entity)) - METHOD(InputBox, setText, void(entity, string)) - METHOD(InputBox, enterText, void(entity, string)) - METHOD(InputBox, keyDown, float(entity, float, float, float)) - METHOD(InputBox, mouseMove, float(entity, vector)) - METHOD(InputBox, mouseRelease, float(entity, vector)) - METHOD(InputBox, mousePress, float(entity, vector)) - METHOD(InputBox, mouseDrag, float(entity, vector)) - METHOD(InputBox, showNotify, void(entity)) - METHOD(InputBox, resizeNotify, void(entity, vector, vector, vector, vector)) + METHOD(InputBox, configureInputBox, void(entity, string, float, float, string)); + METHOD(InputBox, draw, void(entity)); + METHOD(InputBox, setText, void(entity, string)); + METHOD(InputBox, enterText, void(entity, string)); + METHOD(InputBox, keyDown, float(entity, float, float, float)); + METHOD(InputBox, mouseMove, float(entity, vector)); + METHOD(InputBox, mouseRelease, float(entity, vector)); + METHOD(InputBox, mousePress, float(entity, vector)); + METHOD(InputBox, mouseDrag, float(entity, vector)); + METHOD(InputBox, showNotify, void(entity)); + METHOD(InputBox, resizeNotify, void(entity, vector, vector, vector, vector)); ATTRIB(InputBox, src, string, string_null) diff --git a/qcsrc/menu/item/inputcontainer.qc b/qcsrc/menu/item/inputcontainer.qc index 90ca719dc..660bc2d1b 100644 --- a/qcsrc/menu/item/inputcontainer.qc +++ b/qcsrc/menu/item/inputcontainer.qc @@ -2,15 +2,15 @@ #define ITEM_INPUTCONTAINER_H #include "container.qc" CLASS(InputContainer, Container) - METHOD(InputContainer, keyDown, float(entity, float, float, float)) - METHOD(InputContainer, mouseMove, float(entity, vector)) - METHOD(InputContainer, mousePress, float(entity, vector)) - METHOD(InputContainer, mouseRelease, float(entity, vector)) - METHOD(InputContainer, mouseDrag, float(entity, vector)) - METHOD(InputContainer, focusLeave, void(entity)) - METHOD(InputContainer, resizeNotify, void(entity, vector, vector, vector, vector)) + METHOD(InputContainer, keyDown, float(entity, float, float, float)); + METHOD(InputContainer, mouseMove, float(entity, vector)); + METHOD(InputContainer, mousePress, float(entity, vector)); + METHOD(InputContainer, mouseRelease, float(entity, vector)); + METHOD(InputContainer, mouseDrag, float(entity, vector)); + METHOD(InputContainer, focusLeave, void(entity)); + METHOD(InputContainer, resizeNotify, void(entity, vector, vector, vector, vector)); - METHOD(InputContainer, _changeFocusXY, float(entity, vector)) + METHOD(InputContainer, _changeFocusXY, float(entity, vector)); ATTRIB(InputContainer, mouseFocusedChild, entity, NULL) ATTRIB(InputContainer, isTabRoot, float, 0) ENDCLASS(InputContainer) diff --git a/qcsrc/menu/item/label.qc b/qcsrc/menu/item/label.qc index 75e79f0b2..45a5a7fac 100644 --- a/qcsrc/menu/item/label.qc +++ b/qcsrc/menu/item/label.qc @@ -2,12 +2,12 @@ #define ITEM_LABEL_H #include "../item.qc" CLASS(Label, Item) - METHOD(Label, configureLabel, void(entity, string, float, float)) - METHOD(Label, draw, void(entity)) - METHOD(Label, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(Label, setText, void(entity, string)) - METHOD(Label, toString, string(entity)) - METHOD(Label, recalcPositionWithText, void(entity, string)) + METHOD(Label, configureLabel, void(entity, string, float, float)); + METHOD(Label, draw, void(entity)); + METHOD(Label, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(Label, setText, void(entity, string)); + METHOD(Label, toString, string(entity)); + METHOD(Label, recalcPositionWithText, void(entity, string)); ATTRIB(Label, isBold, float, 0) ATTRIB(Label, text, string, string_null) ATTRIB(Label, currentText, string, string_null) diff --git a/qcsrc/menu/item/listbox.qc b/qcsrc/menu/item/listbox.qc index e2bc5324b..9cd76fe98 100644 --- a/qcsrc/menu/item/listbox.qc +++ b/qcsrc/menu/item/listbox.qc @@ -2,15 +2,15 @@ #define ITEM_LISTBOX_H #include "../item.qc" CLASS(ListBox, Item) - METHOD(ListBox, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(ListBox, configureListBox, void(entity, float, float)) - METHOD(ListBox, draw, void(entity)) - METHOD(ListBox, keyDown, float(entity, float, float, float)) - METHOD(ListBox, mouseMove, float(entity, vector)) - METHOD(ListBox, mousePress, float(entity, vector)) - METHOD(ListBox, mouseDrag, float(entity, vector)) - METHOD(ListBox, mouseRelease, float(entity, vector)) - METHOD(ListBox, focusLeave, void(entity)) + METHOD(ListBox, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(ListBox, configureListBox, void(entity, float, float)); + METHOD(ListBox, draw, void(entity)); + METHOD(ListBox, keyDown, float(entity, float, float, float)); + METHOD(ListBox, mouseMove, float(entity, vector)); + METHOD(ListBox, mousePress, float(entity, vector)); + METHOD(ListBox, mouseDrag, float(entity, vector)); + METHOD(ListBox, mouseRelease, float(entity, vector)); + METHOD(ListBox, focusLeave, void(entity)); ATTRIB(ListBox, focusable, float, 1) ATTRIB(ListBox, focusedItem, int, -1) ATTRIB(ListBox, focusedItemAlpha, float, 0.3) @@ -22,12 +22,12 @@ CLASS(ListBox, Item) ATTRIB(ListBox, scrollPos, float, 0) // measured in window heights, fixed when needed ATTRIB(ListBox, scrollPosTarget, float, 0) ATTRIB(ListBox, needScrollToItem, float, -1) - METHOD(ListBox, scrollToItem, void(entity, int)) + METHOD(ListBox, scrollToItem, void(entity, int)); ATTRIB(ListBox, previousValue, float, 0) ATTRIB(ListBox, pressed, float, 0) // 0 = normal, 1 = scrollbar dragging, 2 = item dragging, 3 = released ATTRIB(ListBox, pressOffset, float, 0) - METHOD(ListBox, updateControlTopBottom, void(entity)) + METHOD(ListBox, updateControlTopBottom, void(entity)); ATTRIB(ListBox, controlTop, float, 0) ATTRIB(ListBox, controlBottom, float, 0) ATTRIB(ListBox, controlWidth, float, 0) @@ -49,19 +49,19 @@ CLASS(ListBox, Item) ATTRIB(ListBox, lastClickedItem, float, -1) ATTRIB(ListBox, lastClickedTime, float, 0) - METHOD(ListBox, drawListBoxItem, void(entity, int, vector, bool, bool)) // item number, width/height, isSelected, isFocused - METHOD(ListBox, clickListBoxItem, void(entity, float, vector)) // item number, relative clickpos - METHOD(ListBox, doubleClickListBoxItem, void(entity, float, vector)) // item number, relative clickpos - METHOD(ListBox, setSelected, void(entity, float)) + METHOD(ListBox, drawListBoxItem, void(entity, int, vector, bool, bool)); // item number, width/height, isSelected, isFocused + METHOD(ListBox, clickListBoxItem, void(entity, float, vector)); // item number, relative clickpos + METHOD(ListBox, doubleClickListBoxItem, void(entity, float, vector)); // item number, relative clickpos + METHOD(ListBox, setSelected, void(entity, float)); - METHOD(ListBox, getLastFullyVisibleItemAtScrollPos, float(entity, float)) - METHOD(ListBox, getFirstFullyVisibleItemAtScrollPos, float(entity, float)) + METHOD(ListBox, getLastFullyVisibleItemAtScrollPos, float(entity, float)); + METHOD(ListBox, getFirstFullyVisibleItemAtScrollPos, float(entity, float)); // NOTE: override these four methods if you want variable sized list items - METHOD(ListBox, getTotalHeight, float(entity)) - METHOD(ListBox, getItemAtPos, float(entity, float)) - METHOD(ListBox, getItemStart, float(entity, float)) - METHOD(ListBox, getItemHeight, float(entity, float)) + METHOD(ListBox, getTotalHeight, float(entity)); + METHOD(ListBox, getItemAtPos, float(entity, float)); + METHOD(ListBox, getItemStart, float(entity, float)); + METHOD(ListBox, getItemHeight, float(entity, float)); // NOTE: if getItemAt* are overridden, it may make sense to cache the // start and height of the last item returned by getItemAtPos and fast // track returning their properties for getItemStart and getItemHeight. diff --git a/qcsrc/menu/item/modalcontroller.qc b/qcsrc/menu/item/modalcontroller.qc index a13fcdd69..8232125f7 100644 --- a/qcsrc/menu/item/modalcontroller.qc +++ b/qcsrc/menu/item/modalcontroller.qc @@ -2,17 +2,17 @@ #define ITEM_MODALCONTROLLER_H #include "container.qc" CLASS(ModalController, Container) - METHOD(ModalController, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(ModalController, draw, void(entity)) - METHOD(ModalController, showChild, void(entity, entity, vector, vector, float)) - METHOD(ModalController, hideChild, void(entity, entity, float)) - METHOD(ModalController, hideAll, void(entity, float)) - METHOD(ModalController, addItem, void(entity, entity, vector, vector, float)) - METHOD(ModalController, addTab, void(entity, entity, entity)) + METHOD(ModalController, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(ModalController, draw, void(entity)); + METHOD(ModalController, showChild, void(entity, entity, vector, vector, float)); + METHOD(ModalController, hideChild, void(entity, entity, float)); + METHOD(ModalController, hideAll, void(entity, float)); + METHOD(ModalController, addItem, void(entity, entity, vector, vector, float)); + METHOD(ModalController, addTab, void(entity, entity, entity)); - METHOD(ModalController, initializeDialog, void(entity, entity)) + METHOD(ModalController, initializeDialog, void(entity, entity)); - METHOD(ModalController, switchState, void(entity, entity, float, float)) + METHOD(ModalController, switchState, void(entity, entity, float, float)); ATTRIB(ModalController, origin, vector, '0 0 0') ATTRIB(ModalController, size, vector, '0 0 0') ATTRIB(ModalController, previousButton, entity, NULL) diff --git a/qcsrc/menu/item/nexposee.qc b/qcsrc/menu/item/nexposee.qc index 69d54b7a0..06616e68f 100644 --- a/qcsrc/menu/item/nexposee.qc +++ b/qcsrc/menu/item/nexposee.qc @@ -2,26 +2,26 @@ #define ITEM_NEXPOSEE_H #include "container.qc" CLASS(Nexposee, Container) - METHOD(Nexposee, draw, void(entity)) - METHOD(Nexposee, keyDown, float(entity, float, float, float)) - METHOD(Nexposee, keyUp, float(entity, float, float, float)) - METHOD(Nexposee, mousePress, float(entity, vector)) - METHOD(Nexposee, mouseMove, float(entity, vector)) - METHOD(Nexposee, mouseRelease, float(entity, vector)) - METHOD(Nexposee, mouseDrag, float(entity, vector)) - METHOD(Nexposee, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(Nexposee, focusEnter, void(entity)) - METHOD(Nexposee, close, void(entity)) + METHOD(Nexposee, draw, void(entity)); + METHOD(Nexposee, keyDown, float(entity, float, float, float)); + METHOD(Nexposee, keyUp, float(entity, float, float, float)); + METHOD(Nexposee, mousePress, float(entity, vector)); + METHOD(Nexposee, mouseMove, float(entity, vector)); + METHOD(Nexposee, mouseRelease, float(entity, vector)); + METHOD(Nexposee, mouseDrag, float(entity, vector)); + METHOD(Nexposee, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(Nexposee, focusEnter, void(entity)); + METHOD(Nexposee, close, void(entity)); ATTRIB(Nexposee, animationState, float, -1) ATTRIB(Nexposee, animationFactor, float, 0) ATTRIB(Nexposee, selectedChild, entity, NULL) ATTRIB(Nexposee, mouseFocusedChild, entity, NULL) - METHOD(Nexposee, addItem, void(entity, entity, vector, vector, float)) - METHOD(Nexposee, calc, void(entity)) - METHOD(Nexposee, setNexposee, void(entity, entity, vector, float, float)) + METHOD(Nexposee, addItem, void(entity, entity, vector, vector, float)); + METHOD(Nexposee, calc, void(entity)); + METHOD(Nexposee, setNexposee, void(entity, entity, vector, float, float)); ATTRIB(Nexposee, mousePosition, vector, '0 0 0') - METHOD(Nexposee, pullNexposee, void(entity, entity, vector)) + METHOD(Nexposee, pullNexposee, void(entity, entity, vector)); ENDCLASS(Nexposee) void ExposeeCloseButton_Click(entity button, entity other); // un-exposees the current state diff --git a/qcsrc/menu/item/radiobutton.qc b/qcsrc/menu/item/radiobutton.qc index c1e034855..4dfadd2d5 100644 --- a/qcsrc/menu/item/radiobutton.qc +++ b/qcsrc/menu/item/radiobutton.qc @@ -3,7 +3,7 @@ #include "checkbox.qc" void RadioButton_Click(entity me, entity other); CLASS(RadioButton, CheckBox) - METHOD(RadioButton, configureRadioButton, void(entity, string, float, string, float, float)) + METHOD(RadioButton, configureRadioButton, void(entity, string, float, string, float, float)); ATTRIB(RadioButton, checked, float, 0) ATTRIB(RadioButton, group, float, 0) ATTRIB(RadioButton, allowDeselect, float, 0) diff --git a/qcsrc/menu/item/slider.qc b/qcsrc/menu/item/slider.qc index e944a96ae..465442543 100644 --- a/qcsrc/menu/item/slider.qc +++ b/qcsrc/menu/item/slider.qc @@ -4,20 +4,20 @@ #define ITEM_SLIDER_H #include "label.qc" CLASS(Slider, Label) - METHOD(Slider, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(Slider, configureSliderVisuals, void(entity, float, float, float, string)) - METHOD(Slider, configureSliderValues, void(entity, float, float, float, float, float, float)) - METHOD(Slider, draw, void(entity)) - METHOD(Slider, keyDown, float(entity, float, float, float)) - METHOD(Slider, keyUp, float(entity, float, float, float)) - METHOD(Slider, mousePress, float(entity, vector)) - METHOD(Slider, mouseDrag, float(entity, vector)) - METHOD(Slider, mouseRelease, float(entity, vector)) - METHOD(Slider, valueToText, string(entity, float)) - METHOD(Slider, toString, string(entity)) - METHOD(Slider, setValue, void(entity, float)) - METHOD(Slider, setSliderValue, void(entity, float)) - METHOD(Slider, showNotify, void(entity)) + METHOD(Slider, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(Slider, configureSliderVisuals, void(entity, float, float, float, string)); + METHOD(Slider, configureSliderValues, void(entity, float, float, float, float, float, float)); + METHOD(Slider, draw, void(entity)); + METHOD(Slider, keyDown, float(entity, float, float, float)); + METHOD(Slider, keyUp, float(entity, float, float, float)); + METHOD(Slider, mousePress, float(entity, vector)); + METHOD(Slider, mouseDrag, float(entity, vector)); + METHOD(Slider, mouseRelease, float(entity, vector)); + METHOD(Slider, valueToText, string(entity, float)); + METHOD(Slider, toString, string(entity)); + METHOD(Slider, setValue, void(entity, float)); + METHOD(Slider, setSliderValue, void(entity, float)); + METHOD(Slider, showNotify, void(entity)); ATTRIB(Slider, src, string, string_null) ATTRIB(Slider, focusable, float, 1) ATTRIB(Slider, allowFocusSound, float, 1) diff --git a/qcsrc/menu/item/textslider.qc b/qcsrc/menu/item/textslider.qc index f22e632d6..733b1d612 100644 --- a/qcsrc/menu/item/textslider.qc +++ b/qcsrc/menu/item/textslider.qc @@ -4,14 +4,14 @@ #define ITEM_TEXTSLIDER_H #include "slider.qc" CLASS(TextSlider, Slider) - METHOD(TextSlider, valueToText, string(entity, float)) - METHOD(TextSlider, valueToIdentifier, string(entity, float)) - METHOD(TextSlider, setValueFromIdentifier, void(entity, string)) - METHOD(TextSlider, getIdentifier, string(entity)) - METHOD(TextSlider, clearValues, void(entity)) - METHOD(TextSlider, addValue, void(entity, string, string)) - METHOD(TextSlider, insertValue, void(entity, float, string, string)) - METHOD(TextSlider, configureTextSliderValues, void(entity, string)) + METHOD(TextSlider, valueToText, string(entity, float)); + METHOD(TextSlider, valueToIdentifier, string(entity, float)); + METHOD(TextSlider, setValueFromIdentifier, void(entity, string)); + METHOD(TextSlider, getIdentifier, string(entity)); + METHOD(TextSlider, clearValues, void(entity)); + METHOD(TextSlider, addValue, void(entity, string, string)); + METHOD(TextSlider, insertValue, void(entity, float, string, string)); + METHOD(TextSlider, configureTextSliderValues, void(entity, string)); ATTRIBARRAY(TextSlider, valueStrings, string, 256) ATTRIBARRAY(TextSlider, valueIdentifiers, string, 256) ATTRIB(TextSlider, nValues, int, 0) diff --git a/qcsrc/menu/xonotic/bigbutton.qc b/qcsrc/menu/xonotic/bigbutton.qc index 07b6a074c..4f0acc681 100644 --- a/qcsrc/menu/xonotic/bigbutton.qc +++ b/qcsrc/menu/xonotic/bigbutton.qc @@ -2,7 +2,7 @@ #define BIGBUTTON_H #include "button.qc" CLASS(XonoticBigButton, XonoticButton) - METHOD(XonoticBigButton, configureXonoticBigButton, void(entity, string, vector)) + METHOD(XonoticBigButton, configureXonoticBigButton, void(entity, string, vector)); ATTRIB(XonoticBigButton, image, string, SKINGFX_BUTTON_BIG) ATTRIB(XonoticBigButton, grayImage, string, SKINGFX_BUTTON_BIG_GRAY) ENDCLASS(XonoticBigButton) diff --git a/qcsrc/menu/xonotic/bigcommandbutton.qc b/qcsrc/menu/xonotic/bigcommandbutton.qc index 6798d9b01..53067dde8 100644 --- a/qcsrc/menu/xonotic/bigcommandbutton.qc +++ b/qcsrc/menu/xonotic/bigcommandbutton.qc @@ -2,7 +2,7 @@ #define BIGCOMMANDBUTTON_H #include "commandbutton.qc" CLASS(XonoticBigCommandButton, XonoticCommandButton) - METHOD(XonoticBigCommandButton, configureXonoticBigCommandButton, void(entity, string, vector, string, float)) + METHOD(XonoticBigCommandButton, configureXonoticBigCommandButton, void(entity, string, vector, string, float)); ATTRIB(XonoticBigCommandButton, image, string, SKINGFX_BUTTON_BIG) ATTRIB(XonoticBigCommandButton, grayImage, string, SKINGFX_BUTTON_BIG_GRAY) ENDCLASS(XonoticBigCommandButton) diff --git a/qcsrc/menu/xonotic/button.qc b/qcsrc/menu/xonotic/button.qc index 73518ef96..fb0f416e9 100644 --- a/qcsrc/menu/xonotic/button.qc +++ b/qcsrc/menu/xonotic/button.qc @@ -2,7 +2,7 @@ #define BUTTON_H #include "../item/button.qc" CLASS(XonoticButton, Button) - METHOD(XonoticButton, configureXonoticButton, void(entity, string, vector)) + METHOD(XonoticButton, configureXonoticButton, void(entity, string, vector)); ATTRIB(XonoticButton, fontSize, float, SKINFONTSIZE_NORMAL) ATTRIB(XonoticButton, image, string, SKINGFX_BUTTON) ATTRIB(XonoticButton, grayImage, string, SKINGFX_BUTTON_GRAY) diff --git a/qcsrc/menu/xonotic/campaign.qc b/qcsrc/menu/xonotic/campaign.qc index 238773516..a539d0f6f 100644 --- a/qcsrc/menu/xonotic/campaign.qc +++ b/qcsrc/menu/xonotic/campaign.qc @@ -4,16 +4,16 @@ #define CAMPAIGN_H #include "listbox.qc" CLASS(XonoticCampaignList, XonoticListBox) - METHOD(XonoticCampaignList, configureXonoticCampaignList, void(entity)) + METHOD(XonoticCampaignList, configureXonoticCampaignList, void(entity)); ATTRIB(XonoticCampaignList, rowsPerItem, float, 10) - METHOD(XonoticCampaignList, draw, void(entity)) - METHOD(XonoticCampaignList, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticCampaignList, doubleClickListBoxItem, void(entity, float, vector)) - METHOD(XonoticCampaignList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticCampaignList, setSelected, void(entity, float)) - METHOD(XonoticCampaignList, keyDown, float(entity, float, float, float)) - METHOD(XonoticCampaignList, campaignGo, void(entity, float)) - METHOD(XonoticCampaignList, destroy, void(entity)) + METHOD(XonoticCampaignList, draw, void(entity)); + METHOD(XonoticCampaignList, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticCampaignList, doubleClickListBoxItem, void(entity, float, vector)); + METHOD(XonoticCampaignList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticCampaignList, setSelected, void(entity, float)); + METHOD(XonoticCampaignList, keyDown, float(entity, float, float, float)); + METHOD(XonoticCampaignList, campaignGo, void(entity, float)); + METHOD(XonoticCampaignList, destroy, void(entity)); ATTRIB(XonoticCampaignList, campaignGlob, float, 0) ATTRIB(XonoticCampaignList, realFontSize, vector, '0 0 0') @@ -34,8 +34,8 @@ CLASS(XonoticCampaignList, XonoticListBox) ATTRIB(XonoticCampaignList, campaignIndex, float, 0) ATTRIB(XonoticCampaignList, cvarName, string, string_null) - METHOD(XonoticCampaignList, loadCvars, void(entity)) - METHOD(XonoticCampaignList, saveCvars, void(entity)) + METHOD(XonoticCampaignList, loadCvars, void(entity)); + METHOD(XonoticCampaignList, saveCvars, void(entity)); ATTRIB(XonoticCampaignList, buttonNext, entity, NULL) ATTRIB(XonoticCampaignList, buttonPrev, entity, NULL) diff --git a/qcsrc/menu/xonotic/charmap.qc b/qcsrc/menu/xonotic/charmap.qc index 747d1f03b..1b0881dc5 100644 --- a/qcsrc/menu/xonotic/charmap.qc +++ b/qcsrc/menu/xonotic/charmap.qc @@ -2,20 +2,20 @@ #define CHARMAP_H #include "picker.qc" CLASS(XonoticCharmap, XonoticPicker) - METHOD(XonoticCharmap, configureXonoticCharmap, void(entity, entity)) - METHOD(XonoticCharmap, focusLeave, void(entity)) - METHOD(XonoticCharmap, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticCharmap, keyDown, float(entity, float, float, float)) + METHOD(XonoticCharmap, configureXonoticCharmap, void(entity, entity)); + METHOD(XonoticCharmap, focusLeave, void(entity)); + METHOD(XonoticCharmap, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticCharmap, keyDown, float(entity, float, float, float)); ATTRIB(XonoticCharmap, inputBox, entity, NULL) ATTRIB(XonoticCharmap, realFontSize, vector, '0 0 0') ATTRIB(XonoticCharmap, rows, float, 10) ATTRIB(XonoticCharmap, columns, float, 14) - METHOD(XonoticCharmap, cellSelect, void(entity, vector)) - METHOD(XonoticCharmap, cellIsValid, bool(entity, vector)) - METHOD(XonoticCharmap, cellDraw, void(entity, vector, vector)) - METHOD(XonoticCharmap, charOffset, vector) + METHOD(XonoticCharmap, cellSelect, void(entity, vector)); + METHOD(XonoticCharmap, cellIsValid, bool(entity, vector)); + METHOD(XonoticCharmap, cellDraw, void(entity, vector, vector)); + ATTRIB(XonoticCharmap, charOffset, vector, '0 0 0') ENDCLASS(XonoticCharmap) entity makeXonoticCharmap(entity controlledInputBox); #endif diff --git a/qcsrc/menu/xonotic/checkbox.qc b/qcsrc/menu/xonotic/checkbox.qc index 65db0f5a7..18ac036ae 100644 --- a/qcsrc/menu/xonotic/checkbox.qc +++ b/qcsrc/menu/xonotic/checkbox.qc @@ -2,8 +2,8 @@ #define CHECKBOX_H #include "../item/checkbox.qc" CLASS(XonoticCheckBox, CheckBox) - METHOD(XonoticCheckBox, configureXonoticCheckBox, void(entity, float, float, string, string)) - METHOD(XonoticCheckBox, setChecked, void(entity, float)) + METHOD(XonoticCheckBox, configureXonoticCheckBox, void(entity, float, float, string, string)); + METHOD(XonoticCheckBox, setChecked, void(entity, float)); ATTRIB(XonoticCheckBox, fontSize, float, SKINFONTSIZE_NORMAL) ATTRIB(XonoticCheckBox, image, string, SKINGFX_CHECKBOX) ATTRIB(XonoticCheckBox, yesValue, float, 1) @@ -15,8 +15,8 @@ CLASS(XonoticCheckBox, CheckBox) ATTRIB(XonoticCheckBox, colorD, vector, SKINCOLOR_CHECKBOX_D) ATTRIB(XonoticCheckBox, cvarName, string, string_null) - METHOD(XonoticCheckBox, loadCvars, void(entity)) - METHOD(XonoticCheckBox, saveCvars, void(entity)) + METHOD(XonoticCheckBox, loadCvars, void(entity)); + METHOD(XonoticCheckBox, saveCvars, void(entity)); ATTRIB(XonoticCheckBox, sendCvars, float, 0) ATTRIB(XonoticCheckBox, alpha, float, SKINALPHA_TEXT) diff --git a/qcsrc/menu/xonotic/checkbox_slider_invalid.qc b/qcsrc/menu/xonotic/checkbox_slider_invalid.qc index 9cce51d82..e3ade5b26 100644 --- a/qcsrc/menu/xonotic/checkbox_slider_invalid.qc +++ b/qcsrc/menu/xonotic/checkbox_slider_invalid.qc @@ -2,9 +2,9 @@ #define CHECKBOX_SLIDER_INVALID_H #include "../item/checkbox.qc" CLASS(XonoticSliderCheckBox, CheckBox) - METHOD(XonoticSliderCheckBox, configureXonoticSliderCheckBox, void(entity, float, float, entity, string)) - METHOD(XonoticSliderCheckBox, setChecked, void(entity, float)) - METHOD(XonoticSliderCheckBox, draw, void(entity)) + METHOD(XonoticSliderCheckBox, configureXonoticSliderCheckBox, void(entity, float, float, entity, string)); + METHOD(XonoticSliderCheckBox, setChecked, void(entity, float)); + METHOD(XonoticSliderCheckBox, draw, void(entity)); ATTRIB(XonoticSliderCheckBox, fontSize, float, SKINFONTSIZE_NORMAL) ATTRIB(XonoticSliderCheckBox, image, string, SKINGFX_CHECKBOX) diff --git a/qcsrc/menu/xonotic/checkbox_string.qc b/qcsrc/menu/xonotic/checkbox_string.qc index 2efa1a102..4b5b17f0e 100644 --- a/qcsrc/menu/xonotic/checkbox_string.qc +++ b/qcsrc/menu/xonotic/checkbox_string.qc @@ -2,8 +2,8 @@ #define CHECKBOX_STRING_H #include "../item/checkbox.qc" CLASS(XonoticCheckBoxString, CheckBox) - METHOD(XonoticCheckBoxString, configureXonoticCheckBoxString, void(entity, string, string, string, string)) - METHOD(XonoticCheckBoxString, setChecked, void(entity, float)) + METHOD(XonoticCheckBoxString, configureXonoticCheckBoxString, void(entity, string, string, string, string)); + METHOD(XonoticCheckBoxString, setChecked, void(entity, float)); ATTRIB(XonoticCheckBoxString, fontSize, float, SKINFONTSIZE_NORMAL) ATTRIB(XonoticCheckBoxString, image, string, SKINGFX_CHECKBOX) ATTRIB(XonoticCheckBoxString, yesString, string, string_null) @@ -15,8 +15,8 @@ CLASS(XonoticCheckBoxString, CheckBox) ATTRIB(XonoticCheckBoxString, colorD, vector, SKINCOLOR_CHECKBOX_D) ATTRIB(XonoticCheckBoxString, cvarName, string, string_null) - METHOD(XonoticCheckBoxString, loadCvars, void(entity)) - METHOD(XonoticCheckBoxString, saveCvars, void(entity)) + METHOD(XonoticCheckBoxString, loadCvars, void(entity)); + METHOD(XonoticCheckBoxString, saveCvars, void(entity)); ATTRIB(XonoticCheckBoxString, sendCvars, float, 0) ATTRIB(XonoticCheckBoxString, alpha, float, SKINALPHA_TEXT) diff --git a/qcsrc/menu/xonotic/colorbutton.qc b/qcsrc/menu/xonotic/colorbutton.qc index 950661d73..4efa4a2bd 100644 --- a/qcsrc/menu/xonotic/colorbutton.qc +++ b/qcsrc/menu/xonotic/colorbutton.qc @@ -2,9 +2,9 @@ #define COLORBUTTON_H #include "../item/radiobutton.qc" CLASS(XonoticColorButton, RadioButton) - METHOD(XonoticColorButton, configureXonoticColorButton, void(entity, float, float, float)) - METHOD(XonoticColorButton, setChecked, void(entity, float)) - METHOD(XonoticColorButton, draw, void(entity)) + METHOD(XonoticColorButton, configureXonoticColorButton, void(entity, float, float, float)); + METHOD(XonoticColorButton, setChecked, void(entity, float)); + METHOD(XonoticColorButton, draw, void(entity)); ATTRIB(XonoticColorButton, fontSize, float, 0) ATTRIB(XonoticColorButton, image, string, SKINGFX_COLORBUTTON) @@ -13,8 +13,8 @@ CLASS(XonoticColorButton, RadioButton) ATTRIB(XonoticColorButton, cvarPart, float, 0) ATTRIB(XonoticColorButton, cvarName, string, string_null) ATTRIB(XonoticColorButton, cvarValueFloat, float, 0) - METHOD(XonoticColorButton, loadCvars, void(entity)) - METHOD(XonoticColorButton, saveCvars, void(entity)) + METHOD(XonoticColorButton, loadCvars, void(entity)); + METHOD(XonoticColorButton, saveCvars, void(entity)); ENDCLASS(XonoticColorButton) entity makeXonoticColorButton(float, float, float); #endif diff --git a/qcsrc/menu/xonotic/colorpicker.qc b/qcsrc/menu/xonotic/colorpicker.qc index 450c5fb29..f7d72439d 100644 --- a/qcsrc/menu/xonotic/colorpicker.qc +++ b/qcsrc/menu/xonotic/colorpicker.qc @@ -2,17 +2,17 @@ #define COLORPICKER_H #include "../item/image.qc" CLASS(XonoticColorpicker, Image) - METHOD(XonoticColorpicker, configureXonoticColorpicker, void(entity, entity)) - METHOD(XonoticColorpicker, mousePress, float(entity, vector)) - METHOD(XonoticColorpicker, mouseRelease, float(entity, vector)) - METHOD(XonoticColorpicker, mouseDrag, float(entity, vector)) + METHOD(XonoticColorpicker, configureXonoticColorpicker, void(entity, entity)); + METHOD(XonoticColorpicker, mousePress, float(entity, vector)); + METHOD(XonoticColorpicker, mouseRelease, float(entity, vector)); + METHOD(XonoticColorpicker, mouseDrag, float(entity, vector)); ATTRIB(XonoticColorpicker, controlledTextbox, entity, NULL) ATTRIB(XonoticColorpicker, image, string, SKINGFX_COLORPICKER) ATTRIB(XonoticColorpicker, imagemargin, vector, SKINMARGIN_COLORPICKER) ATTRIB(XonoticColorpicker, focusable, float, 1) - METHOD(XonoticColorpicker, focusLeave, void(entity)) - METHOD(XonoticColorpicker, keyDown, float(entity, float, float, float)) - METHOD(XonoticColorpicker, draw, void(entity)) + METHOD(XonoticColorpicker, focusLeave, void(entity)); + METHOD(XonoticColorpicker, keyDown, float(entity, float, float, float)); + METHOD(XonoticColorpicker, draw, void(entity)); ENDCLASS(XonoticColorpicker) entity makeXonoticColorpicker(entity theTextbox); #endif diff --git a/qcsrc/menu/xonotic/colorpicker_string.qc b/qcsrc/menu/xonotic/colorpicker_string.qc index 0695f057e..6a126dc9f 100644 --- a/qcsrc/menu/xonotic/colorpicker_string.qc +++ b/qcsrc/menu/xonotic/colorpicker_string.qc @@ -2,18 +2,18 @@ #define COLORPICKER_STRING_H #include "../item/image.qc" CLASS(XonoticColorpickerString, Image) - METHOD(XonoticColorpickerString, configureXonoticColorpickerString, void(entity, string, string)) - METHOD(XonoticColorpickerString, mousePress, float(entity, vector)) - METHOD(XonoticColorpickerString, mouseRelease, float(entity, vector)) - METHOD(XonoticColorpickerString, mouseDrag, float(entity, vector)) + METHOD(XonoticColorpickerString, configureXonoticColorpickerString, void(entity, string, string)); + METHOD(XonoticColorpickerString, mousePress, float(entity, vector)); + METHOD(XonoticColorpickerString, mouseRelease, float(entity, vector)); + METHOD(XonoticColorpickerString, mouseDrag, float(entity, vector)); ATTRIB(XonoticColorpickerString, cvarName, string, string_null) - METHOD(XonoticColorpickerString, loadCvars, void(entity)) - METHOD(XonoticColorpickerString, saveCvars, void(entity)) + METHOD(XonoticColorpickerString, loadCvars, void(entity)); + METHOD(XonoticColorpickerString, saveCvars, void(entity)); ATTRIB(XonoticColorpickerString, prevcoords, vector, '0 0 0') ATTRIB(XonoticColorpickerString, image, string, SKINGFX_COLORPICKER) ATTRIB(XonoticColorpickerString, imagemargin, vector, SKINMARGIN_COLORPICKER) ATTRIB(XonoticColorpickerString, focusable, float, 1) - METHOD(XonoticColorpickerString, draw, void(entity)) + METHOD(XonoticColorpickerString, draw, void(entity)); ATTRIB(XonoticColorpickerString, disabledAlpha, float, 0.3) ENDCLASS(XonoticColorpickerString) entity makeXonoticColorpickerString(string theCvar, string theDefaultCvar); diff --git a/qcsrc/menu/xonotic/commandbutton.qc b/qcsrc/menu/xonotic/commandbutton.qc index afea74cb4..db1ec61ef 100644 --- a/qcsrc/menu/xonotic/commandbutton.qc +++ b/qcsrc/menu/xonotic/commandbutton.qc @@ -8,7 +8,7 @@ #define COMMANDBUTTON_H #include "button.qc" CLASS(XonoticCommandButton, XonoticButton) - METHOD(XonoticCommandButton, configureXonoticCommandButton, void(entity, string, vector, string, float)) + METHOD(XonoticCommandButton, configureXonoticCommandButton, void(entity, string, vector, string, float)); ATTRIB(XonoticCommandButton, onClickCommand, string, string_null) ATTRIB(XonoticCommandButton, flags, float, 0) ENDCLASS(XonoticCommandButton) diff --git a/qcsrc/menu/xonotic/credits.qc b/qcsrc/menu/xonotic/credits.qc index e3bc1c339..64fac23d2 100644 --- a/qcsrc/menu/xonotic/credits.qc +++ b/qcsrc/menu/xonotic/credits.qc @@ -2,13 +2,13 @@ #define CREDITS_H #include "listbox.qc" CLASS(XonoticCreditsList, XonoticListBox) - METHOD(XonoticCreditsList, configureXonoticCreditsList, void(entity)) + METHOD(XonoticCreditsList, configureXonoticCreditsList, void(entity)); ATTRIB(XonoticCreditsList, rowsPerItem, float, 1) - METHOD(XonoticCreditsList, draw, void(entity)) - METHOD(XonoticCreditsList, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticCreditsList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticCreditsList, keyDown, float(entity, float, float, float)) - METHOD(XonoticCreditsList, destroy, void(entity)) + METHOD(XonoticCreditsList, draw, void(entity)); + METHOD(XonoticCreditsList, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticCreditsList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticCreditsList, keyDown, float(entity, float, float, float)); + METHOD(XonoticCreditsList, destroy, void(entity)); ATTRIB(XonoticCreditsList, selectionDoesntMatter, bool, true) ATTRIB(XonoticCreditsList, realFontSize, vector, '0 0 0') diff --git a/qcsrc/menu/xonotic/crosshairpicker.qc b/qcsrc/menu/xonotic/crosshairpicker.qc index 8922e7fbf..0ac826a44 100644 --- a/qcsrc/menu/xonotic/crosshairpicker.qc +++ b/qcsrc/menu/xonotic/crosshairpicker.qc @@ -2,14 +2,14 @@ #define CROSSHAIRPICKER_H #include "picker.qc" CLASS(XonoticCrosshairPicker, XonoticPicker) - METHOD(XonoticCrosshairPicker, configureXonoticCrosshairPicker, void(entity)) + METHOD(XonoticCrosshairPicker, configureXonoticCrosshairPicker, void(entity)); ATTRIB(XonoticCrosshairPicker, rows, float, 3) ATTRIB(XonoticCrosshairPicker, columns, float, 12) - METHOD(XonoticCrosshairPicker, cellSelect, void(entity, vector)) - METHOD(XonoticCrosshairPicker, cellIsValid, bool(entity, vector)) - METHOD(XonoticCrosshairPicker, cellDraw, void(entity, vector, vector)) + METHOD(XonoticCrosshairPicker, cellSelect, void(entity, vector)); + METHOD(XonoticCrosshairPicker, cellIsValid, bool(entity, vector)); + METHOD(XonoticCrosshairPicker, cellDraw, void(entity, vector, vector)); ENDCLASS(XonoticCrosshairPicker) entity makeXonoticCrosshairPicker(); #endif diff --git a/qcsrc/menu/xonotic/crosshairpreview.qc b/qcsrc/menu/xonotic/crosshairpreview.qc index f8de85798..90694ca8c 100644 --- a/qcsrc/menu/xonotic/crosshairpreview.qc +++ b/qcsrc/menu/xonotic/crosshairpreview.qc @@ -2,8 +2,8 @@ #define CROSSHAIRPREVIEW_H #include "../item.qc" CLASS(XonoticCrosshairPreview, Item) - METHOD(XonoticCrosshairPreview, configureXonoticCrosshairPreview, void(entity)) - METHOD(XonoticCrosshairPreview, draw, void(entity)) + METHOD(XonoticCrosshairPreview, configureXonoticCrosshairPreview, void(entity)); + METHOD(XonoticCrosshairPreview, draw, void(entity)); ATTRIB(XonoticCrosshairPreview, src, string, string_null) ATTRIB(XonoticCrosshairPreview, src2, string, string_null) ATTRIB(XonoticCrosshairPreview, disabled, float, 0) diff --git a/qcsrc/menu/xonotic/cvarlist.qc b/qcsrc/menu/xonotic/cvarlist.qc index 9a95ed163..9943731f7 100644 --- a/qcsrc/menu/xonotic/cvarlist.qc +++ b/qcsrc/menu/xonotic/cvarlist.qc @@ -2,13 +2,13 @@ #define CVARLIST_H #include "listbox.qc" CLASS(XonoticCvarList, XonoticListBox) - METHOD(XonoticCvarList, configureXonoticCvarList, void(entity)) + METHOD(XonoticCvarList, configureXonoticCvarList, void(entity)); ATTRIB(XonoticCvarList, rowsPerItem, float, 1) - METHOD(XonoticCvarList, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticCvarList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticCvarList, keyDown, float(entity, float, float, float)) + METHOD(XonoticCvarList, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticCvarList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticCvarList, keyDown, float(entity, float, float, float)); - METHOD(XonoticCvarList, destroy, void(entity)) + METHOD(XonoticCvarList, destroy, void(entity)); ATTRIB(XonoticCvarList, realFontSize, vector, '0 0 0') ATTRIB(XonoticCvarList, realUpperMargin, float, 0) @@ -17,9 +17,9 @@ CLASS(XonoticCvarList, XonoticListBox) ATTRIB(XonoticCvarList, columnValueOrigin, float, 0) ATTRIB(XonoticCvarList, columnValueSize, float, 0) - METHOD(XonoticCvarList, mouseRelease, float(entity, vector)) - METHOD(XonoticCvarList, setSelected, void(entity, float)) - METHOD(XonoticCvarList, updateCvarType, float(entity)) + METHOD(XonoticCvarList, mouseRelease, float(entity, vector)); + METHOD(XonoticCvarList, setSelected, void(entity, float)); + METHOD(XonoticCvarList, updateCvarType, float(entity)); ATTRIB(XonoticCvarList, controlledTextbox, entity, NULL) ATTRIB(XonoticCvarList, cvarNameBox, entity, NULL) diff --git a/qcsrc/menu/xonotic/demolist.qc b/qcsrc/menu/xonotic/demolist.qc index f46ee407b..2459d7ca1 100644 --- a/qcsrc/menu/xonotic/demolist.qc +++ b/qcsrc/menu/xonotic/demolist.qc @@ -2,18 +2,18 @@ #define DEMOLIST_H #include "listbox.qc" CLASS(XonoticDemoList, XonoticListBox) - METHOD(XonoticDemoList, configureXonoticDemoList, void(entity)) + METHOD(XonoticDemoList, configureXonoticDemoList, void(entity)); ATTRIB(XonoticDemoList, rowsPerItem, float, 1) - METHOD(XonoticDemoList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticDemoList, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticDemoList, getDemos, void(entity)) - METHOD(XonoticDemoList, startDemo, void(entity)) - METHOD(XonoticDemoList, timeDemo, void(entity)) - METHOD(XonoticDemoList, demoName, string(entity, float)) - METHOD(XonoticDemoList, doubleClickListBoxItem, void(entity, float, vector)) - METHOD(XonoticDemoList, keyDown, float(entity, float, float, float)) - METHOD(XonoticDemoList, destroy, void(entity)) - METHOD(XonoticDemoList, showNotify, void(entity)) + METHOD(XonoticDemoList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticDemoList, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticDemoList, getDemos, void(entity)); + METHOD(XonoticDemoList, startDemo, void(entity)); + METHOD(XonoticDemoList, timeDemo, void(entity)); + METHOD(XonoticDemoList, demoName, string(entity, float)); + METHOD(XonoticDemoList, doubleClickListBoxItem, void(entity, float, vector)); + METHOD(XonoticDemoList, keyDown, float(entity, float, float, float)); + METHOD(XonoticDemoList, destroy, void(entity)); + METHOD(XonoticDemoList, showNotify, void(entity)); ATTRIB(XonoticDemoList, listDemo, float, -1) ATTRIB(XonoticDemoList, realFontSize, vector, '0 0 0') diff --git a/qcsrc/menu/xonotic/dialog.qc b/qcsrc/menu/xonotic/dialog.qc index c1ea16c6b..7c23b4c97 100644 --- a/qcsrc/menu/xonotic/dialog.qc +++ b/qcsrc/menu/xonotic/dialog.qc @@ -29,7 +29,7 @@ CLASS(XonoticDialog, Dialog) ATTRIB(XonoticDialog, alpha, float, SKINALPHA_TEXT) - METHOD(XonoticDialog, configureDialog, void(entity)) + METHOD(XonoticDialog, configureDialog, void(entity)); ENDCLASS(XonoticDialog) #ifndef IMPLEMENTATION entity currentDialog; diff --git a/qcsrc/menu/xonotic/dialog_credits.qc b/qcsrc/menu/xonotic/dialog_credits.qc index a99662663..6cf608fd4 100644 --- a/qcsrc/menu/xonotic/dialog_credits.qc +++ b/qcsrc/menu/xonotic/dialog_credits.qc @@ -2,8 +2,8 @@ #define DIALOG_CREDITS_H #include "dialog.qc" CLASS(XonoticCreditsDialog, XonoticDialog) - METHOD(XonoticCreditsDialog, fill, void(entity)) - METHOD(XonoticCreditsDialog, focusEnter, void(entity)) + METHOD(XonoticCreditsDialog, fill, void(entity)); + METHOD(XonoticCreditsDialog, focusEnter, void(entity)); ATTRIB(XonoticCreditsDialog, title, string, _("Credits")) ATTRIB(XonoticCreditsDialog, color, vector, SKINCOLOR_DIALOG_CREDITS) ATTRIB(XonoticCreditsDialog, intendedWidth, float, SKINWIDTH_CREDITS) diff --git a/qcsrc/menu/xonotic/dialog_firstrun.qc b/qcsrc/menu/xonotic/dialog_firstrun.qc index 894a702d8..19e243844 100644 --- a/qcsrc/menu/xonotic/dialog_firstrun.qc +++ b/qcsrc/menu/xonotic/dialog_firstrun.qc @@ -2,7 +2,7 @@ #define DIALOG_FIRSTRUN_H #include "rootdialog.qc" CLASS(XonoticFirstRunDialog, XonoticRootDialog) - METHOD(XonoticFirstRunDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls + METHOD(XonoticFirstRunDialog, fill, void(entity)); // to be overridden by user to fill the dialog with controls ATTRIB(XonoticFirstRunDialog, title, string, _("Welcome")) ATTRIB(XonoticFirstRunDialog, color, vector, SKINCOLOR_DIALOG_FIRSTRUN) ATTRIB(XonoticFirstRunDialog, intendedWidth, float, 0.7) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc index 9f14754bd..dd54f14ef 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_AMMO_H #include "rootdialog.qc" CLASS(XonoticHUDAmmoDialog, XonoticRootDialog) - METHOD(XonoticHUDAmmoDialog, fill, void(entity)) + METHOD(XonoticHUDAmmoDialog, fill, void(entity)); ATTRIB(XonoticHUDAmmoDialog, title, string, _("Ammo Panel")) ATTRIB(XonoticHUDAmmoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDAmmoDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc index 7e74cdf5e..c888fa733 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_CENTERPRINT_H #include "rootdialog.qc" CLASS(XonoticHUDCenterprintDialog, XonoticRootDialog) - METHOD(XonoticHUDCenterprintDialog, fill, void(entity)) + METHOD(XonoticHUDCenterprintDialog, fill, void(entity)); ATTRIB(XonoticHUDCenterprintDialog, title, string, _("Centerprint Panel")) ATTRIB(XonoticHUDCenterprintDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDCenterprintDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_chat.qc b/qcsrc/menu/xonotic/dialog_hudpanel_chat.qc index c56c312ef..4c18f2066 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_chat.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_chat.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_CHAT_H #include "rootdialog.qc" CLASS(XonoticHUDChatDialog, XonoticRootDialog) - METHOD(XonoticHUDChatDialog, fill, void(entity)) + METHOD(XonoticHUDChatDialog, fill, void(entity)); ATTRIB(XonoticHUDChatDialog, title, string, _("Chat Panel")) ATTRIB(XonoticHUDChatDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDChatDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc b/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc index 0220ea232..df9165e81 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_ENGINEINFO_H #include "rootdialog.qc" CLASS(XonoticHUDEngineInfoDialog, XonoticRootDialog) - METHOD(XonoticHUDEngineInfoDialog, fill, void(entity)) + METHOD(XonoticHUDEngineInfoDialog, fill, void(entity)); ATTRIB(XonoticHUDEngineInfoDialog, title, string, _("Engine Info Panel")) ATTRIB(XonoticHUDEngineInfoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDEngineInfoDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc index f0482bd73..d576e2372 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_HEALTHARMOR_H #include "rootdialog.qc" CLASS(XonoticHUDHealthArmorDialog, XonoticRootDialog) - METHOD(XonoticHUDHealthArmorDialog, fill, void(entity)) + METHOD(XonoticHUDHealthArmorDialog, fill, void(entity)); ATTRIB(XonoticHUDHealthArmorDialog, title, string, _("Health/Armor Panel")) ATTRIB(XonoticHUDHealthArmorDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDHealthArmorDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc b/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc index 84625df73..33b4ca9b7 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_INFOMESSAGES_H #include "rootdialog.qc" CLASS(XonoticHUDInfoMessagesDialog, XonoticRootDialog) - METHOD(XonoticHUDInfoMessagesDialog, fill, void(entity)) + METHOD(XonoticHUDInfoMessagesDialog, fill, void(entity)); ATTRIB(XonoticHUDInfoMessagesDialog, title, string, _("Info Messages Panel")) ATTRIB(XonoticHUDInfoMessagesDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDInfoMessagesDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc b/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc index 77f99dcc5..be5eef529 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_ITEMSTIME_H #include "rootdialog.qc" CLASS(XonoticHUDItemsTimeDialog, XonoticRootDialog) - METHOD(XonoticHUDItemsTimeDialog, fill, void(entity)) + METHOD(XonoticHUDItemsTimeDialog, fill, void(entity)); ATTRIB(XonoticHUDItemsTimeDialog, title, string, _("Items Time Panel")) ATTRIB(XonoticHUDItemsTimeDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDItemsTimeDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc index 9737c5480..1fcefb72f 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_MODICONS_H #include "rootdialog.qc" CLASS(XonoticHUDModIconsDialog, XonoticRootDialog) - METHOD(XonoticHUDModIconsDialog, fill, void(entity)) + METHOD(XonoticHUDModIconsDialog, fill, void(entity)); ATTRIB(XonoticHUDModIconsDialog, title, string, _("Mod Icons Panel")) ATTRIB(XonoticHUDModIconsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDModIconsDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_notification.qc b/qcsrc/menu/xonotic/dialog_hudpanel_notification.qc index d0586710c..93d58d0bb 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_notification.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_notification.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_NOTIFICATION_H #include "rootdialog.qc" CLASS(XonoticHUDNotificationDialog, XonoticRootDialog) - METHOD(XonoticHUDNotificationDialog, fill, void(entity)) + METHOD(XonoticHUDNotificationDialog, fill, void(entity)); ATTRIB(XonoticHUDNotificationDialog, title, string, _("Notification Panel")) ATTRIB(XonoticHUDNotificationDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDNotificationDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_physics.qc b/qcsrc/menu/xonotic/dialog_hudpanel_physics.qc index 606f01aaa..394ab14bc 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_physics.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_physics.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_PHYSICS_H #include "rootdialog.qc" CLASS(XonoticHUDPhysicsDialog, XonoticRootDialog) - METHOD(XonoticHUDPhysicsDialog, fill, void(entity)) + METHOD(XonoticHUDPhysicsDialog, fill, void(entity)); ATTRIB(XonoticHUDPhysicsDialog, title, string, _("Physics Panel")) ATTRIB(XonoticHUDPhysicsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDPhysicsDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc index 0fdb35f49..85abb0f02 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_POWERUPS_H #include "rootdialog.qc" CLASS(XonoticHUDPowerupsDialog, XonoticRootDialog) - METHOD(XonoticHUDPowerupsDialog, fill, void(entity)) + METHOD(XonoticHUDPowerupsDialog, fill, void(entity)); ATTRIB(XonoticHUDPowerupsDialog, title, string, _("Powerups Panel")) ATTRIB(XonoticHUDPowerupsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDPowerupsDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc index 4499d7c0f..1de8e51c3 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_PRESSEDKEYS_H #include "rootdialog.qc" CLASS(XonoticHUDPressedKeysDialog, XonoticRootDialog) - METHOD(XonoticHUDPressedKeysDialog, fill, void(entity)) + METHOD(XonoticHUDPressedKeysDialog, fill, void(entity)); ATTRIB(XonoticHUDPressedKeysDialog, title, string, _("Pressed Keys Panel")) ATTRIB(XonoticHUDPressedKeysDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDPressedKeysDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc index 3333a0e64..79a56230d 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_RACETIMER_H #include "rootdialog.qc" CLASS(XonoticHUDRaceTimerDialog, XonoticRootDialog) - METHOD(XonoticHUDRaceTimerDialog, fill, void(entity)) + METHOD(XonoticHUDRaceTimerDialog, fill, void(entity)); ATTRIB(XonoticHUDRaceTimerDialog, title, string, _("Race Timer Panel")) ATTRIB(XonoticHUDRaceTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDRaceTimerDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_radar.qc b/qcsrc/menu/xonotic/dialog_hudpanel_radar.qc index 0d159b276..b7efc4a39 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_radar.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_radar.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_RADAR_H #include "rootdialog.qc" CLASS(XonoticHUDRadarDialog, XonoticRootDialog) - METHOD(XonoticHUDRadarDialog, fill, void(entity)) + METHOD(XonoticHUDRadarDialog, fill, void(entity)); ATTRIB(XonoticHUDRadarDialog, title, string, _("Radar Panel")) ATTRIB(XonoticHUDRadarDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDRadarDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_score.qc b/qcsrc/menu/xonotic/dialog_hudpanel_score.qc index 690fc3b10..6cbbe4618 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_score.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_score.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_SCORE_H #include "rootdialog.qc" CLASS(XonoticHUDScoreDialog, XonoticRootDialog) - METHOD(XonoticHUDScoreDialog, fill, void(entity)) + METHOD(XonoticHUDScoreDialog, fill, void(entity)); ATTRIB(XonoticHUDScoreDialog, title, string, _("Score Panel")) ATTRIB(XonoticHUDScoreDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDScoreDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc b/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc index d140dea22..ae071e02e 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_timer.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_TIMER_H #include "rootdialog.qc" CLASS(XonoticHUDTimerDialog, XonoticRootDialog) - METHOD(XonoticHUDTimerDialog, fill, void(entity)) + METHOD(XonoticHUDTimerDialog, fill, void(entity)); ATTRIB(XonoticHUDTimerDialog, title, string, _("Timer Panel")) ATTRIB(XonoticHUDTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDTimerDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_vote.qc b/qcsrc/menu/xonotic/dialog_hudpanel_vote.qc index 62d439e33..67eed0c8f 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_vote.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_vote.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_VOTE_H #include "rootdialog.qc" CLASS(XonoticHUDVoteDialog, XonoticRootDialog) - METHOD(XonoticHUDVoteDialog, fill, void(entity)) + METHOD(XonoticHUDVoteDialog, fill, void(entity)); ATTRIB(XonoticHUDVoteDialog, title, string, _("Vote Panel")) ATTRIB(XonoticHUDVoteDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDVoteDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc index a78effc6e..a5fedbd3f 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDPANEL_WEAPONS_H #include "rootdialog.qc" CLASS(XonoticHUDWeaponsDialog, XonoticRootDialog) - METHOD(XonoticHUDWeaponsDialog, fill, void(entity)) + METHOD(XonoticHUDWeaponsDialog, fill, void(entity)); ATTRIB(XonoticHUDWeaponsDialog, title, string, _("Weapons Panel")) ATTRIB(XonoticHUDWeaponsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDWeaponsDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc b/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc index f8f6b9e6e..b9d4c34b7 100644 --- a/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc +++ b/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc @@ -2,7 +2,7 @@ #define DIALOG_HUDSETUP_EXIT_H #include "rootdialog.qc" CLASS(XonoticHUDExitDialog, XonoticRootDialog) - METHOD(XonoticHUDExitDialog, fill, void(entity)) + METHOD(XonoticHUDExitDialog, fill, void(entity)); ATTRIB(XonoticHUDExitDialog, title, string, _("Panel HUD Setup")) ATTRIB(XonoticHUDExitDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDExitDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/dialog_monstertools.qc b/qcsrc/menu/xonotic/dialog_monstertools.qc index 14587e2a9..6b9556507 100644 --- a/qcsrc/menu/xonotic/dialog_monstertools.qc +++ b/qcsrc/menu/xonotic/dialog_monstertools.qc @@ -2,7 +2,7 @@ #define DIALOG_MONSTERTOOLS_H #include "rootdialog.qc" CLASS(XonoticMonsterToolsDialog, XonoticRootDialog) - METHOD(XonoticMonsterToolsDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls + METHOD(XonoticMonsterToolsDialog, fill, void(entity)); // to be overridden by user to fill the dialog with controls ATTRIB(XonoticMonsterToolsDialog, title, string, _("Monster Tools")) ATTRIB(XonoticMonsterToolsDialog, color, vector, SKINCOLOR_DIALOG_SANDBOXTOOLS) ATTRIB(XonoticMonsterToolsDialog, intendedWidth, float, 0.8) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer.qc b/qcsrc/menu/xonotic/dialog_multiplayer.qc index 64cfbd91d..fb0b00fda 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer.qc @@ -2,7 +2,7 @@ #define DIALOG_MULTIPLAYER_H #include "dialog.qc" CLASS(XonoticMultiplayerDialog, XonoticDialog) - METHOD(XonoticMultiplayerDialog, fill, void(entity)) + METHOD(XonoticMultiplayerDialog, fill, void(entity)); ATTRIB(XonoticMultiplayerDialog, title, string, _("Multiplayer")) ATTRIB(XonoticMultiplayerDialog, color, vector, SKINCOLOR_DIALOG_MULTIPLAYER) ATTRIB(XonoticMultiplayerDialog, intendedWidth, float, 0.96) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc index 5759bf0ae..5b7b5ef7a 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc @@ -2,9 +2,9 @@ #define DIALOG_MULTIPLAYER_CREATE_H #include "tab.qc" CLASS(XonoticServerCreateTab, XonoticTab) - METHOD(XonoticServerCreateTab, fill, void(entity)) - METHOD(XonoticServerCreateTab, gameTypeChangeNotify, void(entity)) - METHOD(XonoticServerCreateTab, gameTypeSelectNotify, void(entity)) + METHOD(XonoticServerCreateTab, fill, void(entity)); + METHOD(XonoticServerCreateTab, gameTypeChangeNotify, void(entity)); + METHOD(XonoticServerCreateTab, gameTypeSelectNotify, void(entity)); ATTRIB(XonoticServerCreateTab, intendedWidth, float, 0.9) ATTRIB(XonoticServerCreateTab, rows, float, 23) ATTRIB(XonoticServerCreateTab, columns, float, 6.2) // added extra .2 for center space diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc index 5254f5aa3..2a5c8245a 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc @@ -2,8 +2,8 @@ #define DIALOG_MULTIPLAYER_CREATE_MAPINFO_H #include "dialog.qc" CLASS(XonoticMapInfoDialog, XonoticDialog) - METHOD(XonoticMapInfoDialog, fill, void(entity)) - METHOD(XonoticMapInfoDialog, loadMapInfo, void(entity, float, entity)) + METHOD(XonoticMapInfoDialog, fill, void(entity)); + METHOD(XonoticMapInfoDialog, loadMapInfo, void(entity, float, entity)); ATTRIB(XonoticMapInfoDialog, title, string, _("Map Information")) ATTRIB(XonoticMapInfoDialog, color, vector, SKINCOLOR_DIALOG_MAPINFO) ATTRIB(XonoticMapInfoDialog, intendedWidth, float, 1.0) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc index 8ab529638..a1b299d9f 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc @@ -4,10 +4,10 @@ #define DIALOG_MULTIPLAYER_CREATE_MUTATORS_H #include "dialog.qc" CLASS(XonoticMutatorsDialog, XonoticDialog) - METHOD(XonoticMutatorsDialog, toString, string(entity)) - METHOD(XonoticMutatorsDialog, fill, void(entity)) - METHOD(XonoticMutatorsDialog, showNotify, void(entity)) - METHOD(XonoticMutatorsDialog, close, void(entity)) + METHOD(XonoticMutatorsDialog, toString, string(entity)); + METHOD(XonoticMutatorsDialog, fill, void(entity)); + METHOD(XonoticMutatorsDialog, showNotify, void(entity)); + METHOD(XonoticMutatorsDialog, close, void(entity)); ATTRIB(XonoticMutatorsDialog, title, string, _("Mutators")) ATTRIB(XonoticMutatorsDialog, color, vector, SKINCOLOR_DIALOG_MUTATORS) ATTRIB(XonoticMutatorsDialog, intendedWidth, float, 0.9) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc index a4e480e18..86829871b 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc @@ -2,7 +2,7 @@ #define DIALOG_MULTIPLAYER_JOIN_H #include "tab.qc" CLASS(XonoticServerListTab, XonoticTab) - METHOD(XonoticServerListTab, fill, void(entity)) + METHOD(XonoticServerListTab, fill, void(entity)); ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9) ATTRIB(XonoticServerListTab, rows, float, 23) ATTRIB(XonoticServerListTab, columns, float, 6.5) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc index a5ad63320..62b85269d 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc @@ -4,8 +4,8 @@ #define DIALOG_MULTIPLAYER_JOIN_SERVERINFO_H #include "dialog.qc" CLASS(XonoticServerInfoDialog, XonoticDialog) - METHOD(XonoticServerInfoDialog, fill, void(entity)) - METHOD(XonoticServerInfoDialog, loadServerInfo, void(entity, float)) + METHOD(XonoticServerInfoDialog, fill, void(entity)); + METHOD(XonoticServerInfoDialog, loadServerInfo, void(entity, float)); ATTRIB(XonoticServerInfoDialog, title, string, _("Server Information")) ATTRIB(XonoticServerInfoDialog, color, vector, SKINCOLOR_DIALOG_SERVERINFO) ATTRIB(XonoticServerInfoDialog, intendedWidth, float, 0.8) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc index 03ffd0f36..abecd1ed5 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc @@ -2,7 +2,7 @@ #define DIALOG_MULTIPLAYER_MEDIA_H #include "tab.qc" CLASS(XonoticMediaTab, XonoticTab) - METHOD(XonoticMediaTab, fill, void(entity)) + METHOD(XonoticMediaTab, fill, void(entity)); ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9) ATTRIB(XonoticMediaTab, rows, float, 23) ATTRIB(XonoticMediaTab, columns, float, 3) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc index 788aa5381..6172174d5 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc @@ -2,7 +2,7 @@ #define DIALOG_MULTIPLAYER_MEDIA_DEMO_H #include "tab.qc" CLASS(XonoticDemoBrowserTab, XonoticTab) - METHOD(XonoticDemoBrowserTab, fill, void(entity)) + METHOD(XonoticDemoBrowserTab, fill, void(entity)); ATTRIB(XonoticDemoBrowserTab, intendedWidth, float, 0.9) ATTRIB(XonoticDemoBrowserTab, rows, float, 21) ATTRIB(XonoticDemoBrowserTab, columns, float, 6.5) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc index 8d410ca7d..dedd34356 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc @@ -2,7 +2,7 @@ #define DIALOG_MULTIPLAYER_MEDIA_DEMO_STARTCONFIRM_H #include "dialog.qc" CLASS(XonoticDemoStartConfirmDialog, XonoticDialog) - METHOD(XonoticDemoStartConfirmDialog, fill, void(entity)) + METHOD(XonoticDemoStartConfirmDialog, fill, void(entity)); ATTRIB(XonoticDemoStartConfirmDialog, title, string, _("Disconnect")) ATTRIB(XonoticDemoStartConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM) ATTRIB(XonoticDemoStartConfirmDialog, intendedWidth, float, 0.5) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc index fc3aa4448..6e35565ad 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc @@ -2,7 +2,7 @@ #define DIALOG_MULTIPLAYER_MEDIA_DEMO_TIMECONFIRM_H #include "dialog.qc" CLASS(XonoticDemoTimeConfirmDialog, XonoticDialog) - METHOD(XonoticDemoTimeConfirmDialog, fill, void(entity)) + METHOD(XonoticDemoTimeConfirmDialog, fill, void(entity)); ATTRIB(XonoticDemoTimeConfirmDialog, title, string, _("Disconnect")) ATTRIB(XonoticDemoTimeConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM) ATTRIB(XonoticDemoTimeConfirmDialog, intendedWidth, float, 0.5) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc index 6c0791ff7..d78b5b657 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc @@ -2,7 +2,7 @@ #define DIALOG_MULTIPLAYER_MEDIA_MUSICPLAYER_H #include "tab.qc" CLASS(XonoticMusicPlayerTab, XonoticTab) - METHOD(XonoticMusicPlayerTab, fill, void(entity)) + METHOD(XonoticMusicPlayerTab, fill, void(entity)); ATTRIB(XonoticMusicPlayerTab, intendedWidth, float, 0.9) ATTRIB(XonoticMusicPlayerTab, rows, float, 21) ATTRIB(XonoticMusicPlayerTab, columns, float, 6.5) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc index c6526f2ec..58230253f 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc @@ -2,13 +2,13 @@ #define DIALOG_MULTIPLAYER_MEDIA_SCREENSHOT_H #include "tab.qc" CLASS(XonoticScreenshotBrowserTab, XonoticTab) - METHOD(XonoticScreenshotBrowserTab, fill, void(entity)) + METHOD(XonoticScreenshotBrowserTab, fill, void(entity)); ATTRIB(XonoticScreenshotBrowserTab, intendedWidth, float, 1) ATTRIB(XonoticScreenshotBrowserTab, rows, float, 21) ATTRIB(XonoticScreenshotBrowserTab, columns, float, 6.5) ATTRIB(XonoticScreenshotBrowserTab, name, string, "ScreenshotBrowser") - METHOD(XonoticScreenshotBrowserTab, loadPreviewScreenshot, void(entity, string)) + METHOD(XonoticScreenshotBrowserTab, loadPreviewScreenshot, void(entity, string)); ATTRIB(XonoticScreenshotBrowserTab, screenshotImage, entity, NULL) ATTRIB(XonoticScreenshotBrowserTab, currentScrPath, string, string_null) ENDCLASS(XonoticScreenshotBrowserTab) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc index fa63a17b0..3cf20b7b5 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc @@ -2,10 +2,10 @@ #define DIALOG_MULTIPLAYER_MEDIA_SCREENSHOT_VIEWER_H #include "dialog.qc" CLASS(XonoticScreenshotViewerDialog, XonoticDialog) - METHOD(XonoticScreenshotViewerDialog, fill, void(entity)) - METHOD(XonoticScreenshotViewerDialog, keyDown, float(entity, float, float, float)) - METHOD(XonoticScreenshotViewerDialog, loadScreenshot, void(entity, string)) - METHOD(XonoticScreenshotViewerDialog, close, void(entity)) + METHOD(XonoticScreenshotViewerDialog, fill, void(entity)); + METHOD(XonoticScreenshotViewerDialog, keyDown, float(entity, float, float, float)); + METHOD(XonoticScreenshotViewerDialog, loadScreenshot, void(entity, string)); + METHOD(XonoticScreenshotViewerDialog, close, void(entity)); ATTRIB(XonoticScreenshotViewerDialog, title, string, "Screenshot Viewer") ATTRIB(XonoticScreenshotViewerDialog, name, string, "ScreenshotViewer") ATTRIB(XonoticScreenshotViewerDialog, intendedWidth, float, 1) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc index 9faf42888..80d1ffe99 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc @@ -2,8 +2,8 @@ #define DIALOG_MULTIPLAYER_PROFILE_H #include "tab.qc" CLASS(XonoticProfileTab, XonoticTab) - METHOD(XonoticProfileTab, fill, void(entity)) - METHOD(XonoticProfileTab, draw, void(entity)) + METHOD(XonoticProfileTab, fill, void(entity)); + METHOD(XonoticProfileTab, draw, void(entity)); ATTRIB(XonoticProfileTab, intendedWidth, float, 0.9) ATTRIB(XonoticProfileTab, rows, float, 23) ATTRIB(XonoticProfileTab, columns, float, 6.1) // added extra .2 for center space diff --git a/qcsrc/menu/xonotic/dialog_quit.qc b/qcsrc/menu/xonotic/dialog_quit.qc index fa4cacecb..a7591c71c 100644 --- a/qcsrc/menu/xonotic/dialog_quit.qc +++ b/qcsrc/menu/xonotic/dialog_quit.qc @@ -2,7 +2,7 @@ #define DIALOG_QUIT_H #include "dialog.qc" CLASS(XonoticQuitDialog, XonoticDialog) - METHOD(XonoticQuitDialog, fill, void(entity)) + METHOD(XonoticQuitDialog, fill, void(entity)); ATTRIB(XonoticQuitDialog, title, string, _("Quit")) ATTRIB(XonoticQuitDialog, color, vector, SKINCOLOR_DIALOG_QUIT) ATTRIB(XonoticQuitDialog, intendedWidth, float, 0.5) diff --git a/qcsrc/menu/xonotic/dialog_sandboxtools.qc b/qcsrc/menu/xonotic/dialog_sandboxtools.qc index bcc1ea1f0..e76be3955 100644 --- a/qcsrc/menu/xonotic/dialog_sandboxtools.qc +++ b/qcsrc/menu/xonotic/dialog_sandboxtools.qc @@ -2,7 +2,7 @@ #define DIALOG_SANDBOXTOOLS_H #include "rootdialog.qc" CLASS(XonoticSandboxToolsDialog, XonoticRootDialog) - METHOD(XonoticSandboxToolsDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls + METHOD(XonoticSandboxToolsDialog, fill, void(entity)); // to be overridden by user to fill the dialog with controls ATTRIB(XonoticSandboxToolsDialog, title, string, _("Sandbox Tools")) // ;) ATTRIB(XonoticSandboxToolsDialog, color, vector, SKINCOLOR_DIALOG_SANDBOXTOOLS) ATTRIB(XonoticSandboxToolsDialog, intendedWidth, float, 0.8) diff --git a/qcsrc/menu/xonotic/dialog_settings.qc b/qcsrc/menu/xonotic/dialog_settings.qc index e17ab14e6..eb57476af 100644 --- a/qcsrc/menu/xonotic/dialog_settings.qc +++ b/qcsrc/menu/xonotic/dialog_settings.qc @@ -2,7 +2,7 @@ #define DIALOG_SETTINGS_H #include "dialog.qc" CLASS(XonoticSettingsDialog, XonoticDialog) - METHOD(XonoticSettingsDialog, fill, void(entity)) + METHOD(XonoticSettingsDialog, fill, void(entity)); ATTRIB(XonoticSettingsDialog, title, string, _("Settings")) ATTRIB(XonoticSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS) ATTRIB(XonoticSettingsDialog, intendedWidth, float, 0.96) diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.qc b/qcsrc/menu/xonotic/dialog_settings_audio.qc index af8faddac..13f5264c1 100644 --- a/qcsrc/menu/xonotic/dialog_settings_audio.qc +++ b/qcsrc/menu/xonotic/dialog_settings_audio.qc @@ -2,7 +2,7 @@ #define DIALOG_SETTINGS_AUDIO_H #include "tab.qc" CLASS(XonoticAudioSettingsTab, XonoticTab) - METHOD(XonoticAudioSettingsTab, fill, void(entity)) + METHOD(XonoticAudioSettingsTab, fill, void(entity)); ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticAudioSettingsTab, rows, float, 15.5) ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2) // added extra .2 for center space diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.qc b/qcsrc/menu/xonotic/dialog_settings_effects.qc index d06465082..c07152997 100644 --- a/qcsrc/menu/xonotic/dialog_settings_effects.qc +++ b/qcsrc/menu/xonotic/dialog_settings_effects.qc @@ -2,7 +2,7 @@ #define DIALOG_SETTINGS_EFFECTS_H #include "tab.qc" CLASS(XonoticEffectsSettingsTab, XonoticTab) - METHOD(XonoticEffectsSettingsTab, fill, void(entity)) + METHOD(XonoticEffectsSettingsTab, fill, void(entity)); ATTRIB(XonoticEffectsSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticEffectsSettingsTab, rows, float, 15.5) ATTRIB(XonoticEffectsSettingsTab, columns, float, 6.2) // added extra .2 for center space diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qc b/qcsrc/menu/xonotic/dialog_settings_game.qc index 5b14b7bdb..2dcdebca9 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game.qc @@ -2,7 +2,7 @@ #define DIALOG_SETTINGS_GAME_H #include "tab.qc" CLASS(XonoticGameSettingsTab, XonoticTab) - METHOD(XonoticGameSettingsTab, fill, void(entity)) + METHOD(XonoticGameSettingsTab, fill, void(entity)); ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticGameSettingsTab, rows, float, 15.5) ATTRIB(XonoticGameSettingsTab, columns, float, 6.5) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc index cee4bd5c7..db197d604 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc @@ -2,8 +2,8 @@ #define DIALOG_SETTINGS_GAME_CROSSHAIR_H #include "tab.qc" CLASS(XonoticGameCrosshairSettingsTab, XonoticTab) - METHOD(XonoticGameCrosshairSettingsTab, fill, void(entity)) - METHOD(XonoticGameCrosshairSettingsTab, showNotify, void(entity)) + METHOD(XonoticGameCrosshairSettingsTab, fill, void(entity)); + METHOD(XonoticGameCrosshairSettingsTab, showNotify, void(entity)); ATTRIB(XonoticGameCrosshairSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticGameCrosshairSettingsTab, rows, float, 13) ATTRIB(XonoticGameCrosshairSettingsTab, columns, float, 6.2) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc index 941daa792..c9fc6d821 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc @@ -2,8 +2,8 @@ #define DIALOG_SETTINGS_GAME_HUD_H #include "tab.qc" CLASS(XonoticGameHUDSettingsTab, XonoticTab) - METHOD(XonoticGameHUDSettingsTab, fill, void(entity)) - METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity)) + METHOD(XonoticGameHUDSettingsTab, fill, void(entity)); + METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity)); ATTRIB(XonoticGameHUDSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticGameHUDSettingsTab, rows, float, 13) ATTRIB(XonoticGameHUDSettingsTab, columns, float, 6.2) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc b/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc index d0b460b91..6d3fa1f02 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc @@ -2,7 +2,7 @@ #define DIALOG_SETTINGS_GAME_HUDCONFIRM_H #include "dialog.qc" CLASS(XonoticHUDConfirmDialog, XonoticDialog) - METHOD(XonoticHUDConfirmDialog, fill, void(entity)) + METHOD(XonoticHUDConfirmDialog, fill, void(entity)); ATTRIB(XonoticHUDConfirmDialog, title, string, _("Enter HUD editor")) ATTRIB(XonoticHUDConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM) ATTRIB(XonoticHUDConfirmDialog, intendedWidth, float, 0.5) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_messages.qc b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc index d52a102d4..764d7ef50 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_messages.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc @@ -2,8 +2,8 @@ #define DIALOG_SETTINGS_GAME_MESSAGES_H #include "tab.qc" CLASS(XonoticGameMessageSettingsTab, XonoticTab) - METHOD(XonoticGameMessageSettingsTab, fill, void(entity)) - METHOD(XonoticGameMessageSettingsTab, showNotify, void(entity)) + METHOD(XonoticGameMessageSettingsTab, fill, void(entity)); + METHOD(XonoticGameMessageSettingsTab, showNotify, void(entity)); ATTRIB(XonoticGameMessageSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticGameMessageSettingsTab, rows, float, 13) ATTRIB(XonoticGameMessageSettingsTab, columns, float, 6) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.qc b/qcsrc/menu/xonotic/dialog_settings_game_model.qc index db3e4082c..f91f7f039 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_model.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qc @@ -2,8 +2,8 @@ #define DIALOG_SETTINGS_GAME_MODEL_H #include "tab.qc" CLASS(XonoticGameModelSettingsTab, XonoticTab) - METHOD(XonoticGameModelSettingsTab, fill, void(entity)) - METHOD(XonoticGameModelSettingsTab, showNotify, void(entity)) + METHOD(XonoticGameModelSettingsTab, fill, void(entity)); + METHOD(XonoticGameModelSettingsTab, showNotify, void(entity)); ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticGameModelSettingsTab, rows, float, 13) ATTRIB(XonoticGameModelSettingsTab, columns, float, 5) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.qc b/qcsrc/menu/xonotic/dialog_settings_game_view.qc index 8fc56f94c..939fd0dc9 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_view.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_view.qc @@ -2,8 +2,8 @@ #define DIALOG_SETTINGS_GAME_VIEW_H #include "tab.qc" CLASS(XonoticGameViewSettingsTab, XonoticTab) - METHOD(XonoticGameViewSettingsTab, fill, void(entity)) - METHOD(XonoticGameViewSettingsTab, showNotify, void(entity)) + METHOD(XonoticGameViewSettingsTab, fill, void(entity)); + METHOD(XonoticGameViewSettingsTab, showNotify, void(entity)); ATTRIB(XonoticGameViewSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticGameViewSettingsTab, rows, float, 13) ATTRIB(XonoticGameViewSettingsTab, columns, float, 6.2) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc index c59a9620d..aab91c748 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc @@ -2,8 +2,8 @@ #define DIALOG_SETTINGS_GAME_WEAPONS_H #include "tab.qc" CLASS(XonoticGameWeaponsSettingsTab, XonoticTab) - METHOD(XonoticGameWeaponsSettingsTab, fill, void(entity)) - METHOD(XonoticGameWeaponsSettingsTab, showNotify, void(entity)) + METHOD(XonoticGameWeaponsSettingsTab, fill, void(entity)); + METHOD(XonoticGameWeaponsSettingsTab, showNotify, void(entity)); ATTRIB(XonoticGameWeaponsSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticGameWeaponsSettingsTab, rows, float, 13) ATTRIB(XonoticGameWeaponsSettingsTab, columns, float, 6) diff --git a/qcsrc/menu/xonotic/dialog_settings_input.qc b/qcsrc/menu/xonotic/dialog_settings_input.qc index f8e53c03a..c36c26e54 100644 --- a/qcsrc/menu/xonotic/dialog_settings_input.qc +++ b/qcsrc/menu/xonotic/dialog_settings_input.qc @@ -2,7 +2,7 @@ #define DIALOG_SETTINGS_INPUT_H #include "tab.qc" CLASS(XonoticInputSettingsTab, XonoticTab) - METHOD(XonoticInputSettingsTab, fill, void(entity)) + METHOD(XonoticInputSettingsTab, fill, void(entity)); ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticInputSettingsTab, rows, float, 15.5) ATTRIB(XonoticInputSettingsTab, columns, float, 6.2) // added extra .2 for center space diff --git a/qcsrc/menu/xonotic/dialog_settings_input_userbind.qc b/qcsrc/menu/xonotic/dialog_settings_input_userbind.qc index d6ad2e709..d88be1d59 100644 --- a/qcsrc/menu/xonotic/dialog_settings_input_userbind.qc +++ b/qcsrc/menu/xonotic/dialog_settings_input_userbind.qc @@ -2,8 +2,8 @@ #define DIALOG_SETTINGS_INPUT_USERBIND_H #include "dialog.qc" CLASS(XonoticUserbindEditDialog, XonoticDialog) - METHOD(XonoticUserbindEditDialog, loadUserBind, void(entity, string, string, string)) - METHOD(XonoticUserbindEditDialog, fill, void(entity)) + METHOD(XonoticUserbindEditDialog, loadUserBind, void(entity, string, string, string)); + METHOD(XonoticUserbindEditDialog, fill, void(entity)); ATTRIB(XonoticUserbindEditDialog, title, string, _("User defined key bind")) ATTRIB(XonoticUserbindEditDialog, color, vector, SKINCOLOR_DIALOG_USERBIND) ATTRIB(XonoticUserbindEditDialog, intendedWidth, float, 0.7) diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.qc b/qcsrc/menu/xonotic/dialog_settings_misc.qc index 79e196170..877b070ff 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc.qc +++ b/qcsrc/menu/xonotic/dialog_settings_misc.qc @@ -2,7 +2,7 @@ #define DIALOG_SETTINGS_MISC_H #include "tab.qc" CLASS(XonoticMiscSettingsTab, XonoticTab) - METHOD(XonoticMiscSettingsTab, fill, void(entity)) + METHOD(XonoticMiscSettingsTab, fill, void(entity)); ATTRIB(XonoticMiscSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticMiscSettingsTab, rows, float, 15.5) ATTRIB(XonoticMiscSettingsTab, columns, float, 6.2) diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc index af75e64b9..6ace10c12 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc +++ b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qc @@ -2,8 +2,8 @@ #define DIALOG_SETTINGS_MISC_CVARS_H #include "dialog.qc" CLASS(XonoticCvarsDialog, XonoticDialog) - METHOD(XonoticCvarsDialog, fill, void(entity)) - METHOD(XonoticCvarsDialog, showNotify, void(entity)) + METHOD(XonoticCvarsDialog, fill, void(entity)); + METHOD(XonoticCvarsDialog, showNotify, void(entity)); ATTRIB(XonoticCvarsDialog, title, string, _("Advanced settings")) ATTRIB(XonoticCvarsDialog, color, vector, SKINCOLOR_DIALOG_CVARS) ATTRIB(XonoticCvarsDialog, intendedWidth, float, 0.8) diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc b/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc index 2f9932159..f989f8859 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc +++ b/qcsrc/menu/xonotic/dialog_settings_misc_reset.qc @@ -2,7 +2,7 @@ #define DIALOG_SETTINGS_MISC_RESET_H #include "dialog.qc" CLASS(XonoticResetDialog, XonoticDialog) - METHOD(XonoticResetDialog, fill, void(entity)) + METHOD(XonoticResetDialog, fill, void(entity)); ATTRIB(XonoticResetDialog, title, string, _("Factory reset")) ATTRIB(XonoticResetDialog, color, vector, SKINCOLOR_DIALOG_QUIT) ATTRIB(XonoticResetDialog, intendedWidth, float, 0.5) diff --git a/qcsrc/menu/xonotic/dialog_settings_user.qc b/qcsrc/menu/xonotic/dialog_settings_user.qc index 35246ae17..4a8712c26 100644 --- a/qcsrc/menu/xonotic/dialog_settings_user.qc +++ b/qcsrc/menu/xonotic/dialog_settings_user.qc @@ -2,7 +2,7 @@ #define DIALOG_SETTINGS_USER_H #include "tab.qc" CLASS(XonoticUserSettingsTab, XonoticTab) - METHOD(XonoticUserSettingsTab, fill, void(entity)) + METHOD(XonoticUserSettingsTab, fill, void(entity)); ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticUserSettingsTab, rows, float, 15.5) ATTRIB(XonoticUserSettingsTab, columns, float, 6) diff --git a/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc b/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc index 0a340eaff..73a339411 100644 --- a/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc +++ b/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qc @@ -2,7 +2,7 @@ #define DIALOG_SETTINGS_USER_LANGUAGEWARNING_H #include "dialog.qc" CLASS(XonoticLanguageWarningDialog, XonoticDialog) - METHOD(XonoticLanguageWarningDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls + METHOD(XonoticLanguageWarningDialog, fill, void(entity)); // to be overridden by user to fill the dialog with controls ATTRIB(XonoticLanguageWarningDialog, title, string, _("Warning")) ATTRIB(XonoticLanguageWarningDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM) ATTRIB(XonoticLanguageWarningDialog, intendedWidth, float, 0.6) diff --git a/qcsrc/menu/xonotic/dialog_settings_video.qc b/qcsrc/menu/xonotic/dialog_settings_video.qc index 61a93f62e..c4981bb1a 100644 --- a/qcsrc/menu/xonotic/dialog_settings_video.qc +++ b/qcsrc/menu/xonotic/dialog_settings_video.qc @@ -2,7 +2,7 @@ #define DIALOG_SETTINGS_VIDEO_H #include "tab.qc" CLASS(XonoticVideoSettingsTab, XonoticTab) - METHOD(XonoticVideoSettingsTab, fill, void(entity)) + METHOD(XonoticVideoSettingsTab, fill, void(entity)); ATTRIB(XonoticVideoSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticVideoSettingsTab, rows, float, 15.5) ATTRIB(XonoticVideoSettingsTab, columns, float, 6.2) // added extra .2 for center space diff --git a/qcsrc/menu/xonotic/dialog_singleplayer.qc b/qcsrc/menu/xonotic/dialog_singleplayer.qc index aa00d8fe8..8dab35f99 100644 --- a/qcsrc/menu/xonotic/dialog_singleplayer.qc +++ b/qcsrc/menu/xonotic/dialog_singleplayer.qc @@ -2,7 +2,7 @@ #define DIALOG_SINGLEPLAYER_H #include "dialog.qc" CLASS(XonoticSingleplayerDialog, XonoticDialog) - METHOD(XonoticSingleplayerDialog, fill, void(entity)) + METHOD(XonoticSingleplayerDialog, fill, void(entity)); ATTRIB(XonoticSingleplayerDialog, title, string, _("Singleplayer")) ATTRIB(XonoticSingleplayerDialog, color, vector, SKINCOLOR_DIALOG_SINGLEPLAYER) ATTRIB(XonoticSingleplayerDialog, intendedWidth, float, 0.80) diff --git a/qcsrc/menu/xonotic/dialog_singleplayer_winner.qc b/qcsrc/menu/xonotic/dialog_singleplayer_winner.qc index bc9d1c4ea..b7b97c973 100644 --- a/qcsrc/menu/xonotic/dialog_singleplayer_winner.qc +++ b/qcsrc/menu/xonotic/dialog_singleplayer_winner.qc @@ -2,8 +2,8 @@ #define DIALOG_SINGLEPLAYER_WINNER_H #include "dialog.qc" CLASS(XonoticWinnerDialog, XonoticDialog) - METHOD(XonoticWinnerDialog, fill, void(entity)) - METHOD(XonoticWinnerDialog, focusEnter, void(entity)) + METHOD(XonoticWinnerDialog, fill, void(entity)); + METHOD(XonoticWinnerDialog, focusEnter, void(entity)); ATTRIB(XonoticWinnerDialog, title, string, _("Winner")) ATTRIB(XonoticWinnerDialog, color, vector, SKINCOLOR_DIALOG_SINGLEPLAYER) ATTRIB(XonoticWinnerDialog, intendedWidth, float, 0.32) diff --git a/qcsrc/menu/xonotic/dialog_teamselect.qc b/qcsrc/menu/xonotic/dialog_teamselect.qc index 8ed9d7ef2..2c09e8613 100644 --- a/qcsrc/menu/xonotic/dialog_teamselect.qc +++ b/qcsrc/menu/xonotic/dialog_teamselect.qc @@ -2,8 +2,8 @@ #define DIALOG_TEAMSELECT_H #include "rootdialog.qc" CLASS(XonoticTeamSelectDialog, XonoticRootDialog) - METHOD(XonoticTeamSelectDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls - METHOD(XonoticTeamSelectDialog, showNotify, void(entity)) + METHOD(XonoticTeamSelectDialog, fill, void(entity)); // to be overridden by user to fill the dialog with controls + METHOD(XonoticTeamSelectDialog, showNotify, void(entity)); ATTRIB(XonoticTeamSelectDialog, title, string, _("Team Selection")) // ;) ATTRIB(XonoticTeamSelectDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticTeamSelectDialog, intendedWidth, float, 0.4) diff --git a/qcsrc/menu/xonotic/gametypebutton.qc b/qcsrc/menu/xonotic/gametypebutton.qc index ae202560c..f27a62678 100644 --- a/qcsrc/menu/xonotic/gametypebutton.qc +++ b/qcsrc/menu/xonotic/gametypebutton.qc @@ -2,8 +2,8 @@ #define GAMETYPEBUTTON_H #include "../item/radiobutton.qc" CLASS(XonoticGametypeButton, RadioButton) - METHOD(XonoticGametypeButton, configureXonoticGametypeButton, void(entity, float, string, string)) - METHOD(XonoticGametypeButton, setChecked, void(entity, float)) + METHOD(XonoticGametypeButton, configureXonoticGametypeButton, void(entity, float, string, string)); + METHOD(XonoticGametypeButton, setChecked, void(entity, float)); ATTRIB(XonoticGametypeButton, fontSize, float, SKINFONTSIZE_NORMAL) ATTRIB(XonoticGametypeButton, image, string, SKINGFX_BUTTON_BIG) ATTRIB(XonoticGametypeButton, color, vector, SKINCOLOR_BUTTON_N) @@ -14,8 +14,8 @@ CLASS(XonoticGametypeButton, RadioButton) ATTRIB(XonoticGametypeButton, useDownAsChecked, float, 1) ATTRIB(XonoticGametypeButton, cvarName, string, string_null) - METHOD(XonoticGametypeButton, loadCvars, void(entity)) - METHOD(XonoticGametypeButton, saveCvars, void(entity)) + METHOD(XonoticGametypeButton, loadCvars, void(entity)); + METHOD(XonoticGametypeButton, saveCvars, void(entity)); ATTRIB(XonoticGametypeButton, alpha, float, SKINALPHA_TEXT) ATTRIB(XonoticGametypeButton, disabledAlpha, float, SKINALPHA_DISABLED) diff --git a/qcsrc/menu/xonotic/gametypelist.qc b/qcsrc/menu/xonotic/gametypelist.qc index 030af6715..e2fdfa8e7 100644 --- a/qcsrc/menu/xonotic/gametypelist.qc +++ b/qcsrc/menu/xonotic/gametypelist.qc @@ -2,15 +2,15 @@ #define GAMETYPELIST_H #include "listbox.qc" CLASS(XonoticGametypeList, XonoticListBox) - METHOD(XonoticGametypeList, configureXonoticGametypeList, void(entity)) + METHOD(XonoticGametypeList, configureXonoticGametypeList, void(entity)); ATTRIB(XonoticGametypeList, rowsPerItem, float, 2) - METHOD(XonoticGametypeList, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticGametypeList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticGametypeList, setSelected, void(entity, float)) - METHOD(XonoticGametypeList, loadCvars, void(entity)) - METHOD(XonoticGametypeList, saveCvars, void(entity)) - METHOD(XonoticGametypeList, keyDown, float(entity, float, float, float)) - METHOD(XonoticGametypeList, clickListBoxItem, void(entity, float, vector)) + METHOD(XonoticGametypeList, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticGametypeList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticGametypeList, setSelected, void(entity, float)); + METHOD(XonoticGametypeList, loadCvars, void(entity)); + METHOD(XonoticGametypeList, saveCvars, void(entity)); + METHOD(XonoticGametypeList, keyDown, float(entity, float, float, float)); + METHOD(XonoticGametypeList, clickListBoxItem, void(entity, float, vector)); ATTRIB(XonoticGametypeList, realFontSize, vector, '0 0 0') ATTRIB(XonoticGametypeList, realUpperMargin, float, 0) diff --git a/qcsrc/menu/xonotic/image.qc b/qcsrc/menu/xonotic/image.qc index e8f5a8269..1f25899c1 100644 --- a/qcsrc/menu/xonotic/image.qc +++ b/qcsrc/menu/xonotic/image.qc @@ -2,7 +2,7 @@ #define IMAGE_H #include "../item/image.qc" CLASS(XonoticImage, Image) - METHOD(XonoticImage, configureXonoticImage, void(entity, string, float)) + METHOD(XonoticImage, configureXonoticImage, void(entity, string, float)); ENDCLASS(XonoticImage) entity makeXonoticImage(string theImage, float theAspect); #endif diff --git a/qcsrc/menu/xonotic/inputbox.qc b/qcsrc/menu/xonotic/inputbox.qc index de1580160..0ff3aaee3 100644 --- a/qcsrc/menu/xonotic/inputbox.qc +++ b/qcsrc/menu/xonotic/inputbox.qc @@ -2,9 +2,9 @@ #define INPUTBOX_H #include "../item/inputbox.qc" CLASS(XonoticInputBox, InputBox) - METHOD(XonoticInputBox, configureXonoticInputBox, void(entity, float, string)) - METHOD(XonoticInputBox, focusLeave, void(entity)) - METHOD(XonoticInputBox, setText, void(entity, string)) + METHOD(XonoticInputBox, configureXonoticInputBox, void(entity, float, string)); + METHOD(XonoticInputBox, focusLeave, void(entity)); + METHOD(XonoticInputBox, setText, void(entity, string)); ATTRIB(XonoticInputBox, fontSize, float, SKINFONTSIZE_NORMAL) ATTRIB(XonoticInputBox, image, string, SKINGFX_INPUTBOX) ATTRIB(XonoticInputBox, onChange, void(entity, entity), func_null) @@ -26,10 +26,10 @@ CLASS(XonoticInputBox, InputBox) ATTRIB(XonoticInputBox, cb_colorC, vector, SKINCOLOR_CLEARBUTTON_C) ATTRIB(XonoticInputBox, cvarName, string, string_null) - METHOD(XonoticInputBox, loadCvars, void(entity)) - METHOD(XonoticInputBox, saveCvars, void(entity)) + METHOD(XonoticInputBox, loadCvars, void(entity)); + METHOD(XonoticInputBox, saveCvars, void(entity)); ATTRIB(XonoticInputBox, sendCvars, float, 0) - METHOD(XonoticInputBox, keyDown, float(entity, float, float, float)) + METHOD(XonoticInputBox, keyDown, float(entity, float, float, float)); ATTRIB(XonoticInputBox, saveImmediately, float, 0) ENDCLASS(XonoticInputBox) diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc index 8953b1db9..a510a757c 100644 --- a/qcsrc/menu/xonotic/keybinder.qc +++ b/qcsrc/menu/xonotic/keybinder.qc @@ -2,14 +2,14 @@ #define KEYBINDER_H #include "listbox.qc" CLASS(XonoticKeyBinder, XonoticListBox) - METHOD(XonoticKeyBinder, configureXonoticKeyBinder, void(entity)) + METHOD(XonoticKeyBinder, configureXonoticKeyBinder, void(entity)); ATTRIB(XonoticKeyBinder, rowsPerItem, int, 1) - METHOD(XonoticKeyBinder, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticKeyBinder, doubleClickListBoxItem, void(entity, float, vector)) - METHOD(XonoticKeyBinder, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticKeyBinder, setSelected, void(entity, float)) - METHOD(XonoticKeyBinder, keyDown, float(entity, float, float, float)) - METHOD(XonoticKeyBinder, keyGrabbed, void(entity, float, float)) + METHOD(XonoticKeyBinder, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticKeyBinder, doubleClickListBoxItem, void(entity, float, vector)); + METHOD(XonoticKeyBinder, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticKeyBinder, setSelected, void(entity, float)); + METHOD(XonoticKeyBinder, keyDown, float(entity, float, float, float)); + METHOD(XonoticKeyBinder, keyGrabbed, void(entity, float, float)); ATTRIB(XonoticKeyBinder, realFontSize, vector, '0 0 0') ATTRIB(XonoticKeyBinder, realUpperMargin, float, 0) @@ -24,7 +24,7 @@ CLASS(XonoticKeyBinder, XonoticListBox) ATTRIB(XonoticKeyBinder, keyGrabButton, entity, NULL) ATTRIB(XonoticKeyBinder, clearButton, entity, NULL) ATTRIB(XonoticKeyBinder, userbindEditDialog, entity, NULL) - METHOD(XonoticKeyBinder, editUserbind, void(entity, string, string, string)) + METHOD(XonoticKeyBinder, editUserbind, void(entity, string, string, string)); ENDCLASS(XonoticKeyBinder) entity makeXonoticKeyBinder(); void KeyBinder_Bind_Change(entity btn, entity me); diff --git a/qcsrc/menu/xonotic/languagelist.qc b/qcsrc/menu/xonotic/languagelist.qc index 4ff177556..0b7281dbf 100644 --- a/qcsrc/menu/xonotic/languagelist.qc +++ b/qcsrc/menu/xonotic/languagelist.qc @@ -2,13 +2,13 @@ #define LANGUAGELIST_H #include "listbox.qc" CLASS(XonoticLanguageList, XonoticListBox) - METHOD(XonoticLanguageList, configureXonoticLanguageList, void(entity)) + METHOD(XonoticLanguageList, configureXonoticLanguageList, void(entity)); ATTRIB(XonoticLanguageList, rowsPerItem, float, 1) - METHOD(XonoticLanguageList, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticLanguageList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticLanguageList, setSelected, void(entity, float)) - METHOD(XonoticLanguageList, loadCvars, void(entity)) - METHOD(XonoticLanguageList, saveCvars, void(entity)) + METHOD(XonoticLanguageList, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticLanguageList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticLanguageList, setSelected, void(entity, float)); + METHOD(XonoticLanguageList, loadCvars, void(entity)); + METHOD(XonoticLanguageList, saveCvars, void(entity)); ATTRIB(XonoticLanguageList, realFontSize, vector, '0 0 0') ATTRIB(XonoticLanguageList, realUpperMargin, float, 0) @@ -17,15 +17,15 @@ CLASS(XonoticLanguageList, XonoticListBox) ATTRIB(XonoticLanguageList, columnPercentageOrigin, float, 0) ATTRIB(XonoticLanguageList, columnPercentageSize, float, 0) - METHOD(XonoticLanguageList, doubleClickListBoxItem, void(entity, float, vector)) - METHOD(XonoticLanguageList, keyDown, float(entity, float, float, float)) // enter handling + METHOD(XonoticLanguageList, doubleClickListBoxItem, void(entity, float, vector)); + METHOD(XonoticLanguageList, keyDown, float(entity, float, float, float)); // enter handling - METHOD(XonoticLanguageList, destroy, void(entity)) + METHOD(XonoticLanguageList, destroy, void(entity)); ATTRIB(XonoticLanguageList, languagelist, float, -1) - METHOD(XonoticLanguageList, getLanguages, void(entity)) - METHOD(XonoticLanguageList, setLanguage, void(entity)) - METHOD(XonoticLanguageList, languageParameter, string(entity, float, float)) + METHOD(XonoticLanguageList, getLanguages, void(entity)); + METHOD(XonoticLanguageList, setLanguage, void(entity)); + METHOD(XonoticLanguageList, languageParameter, string(entity, float, float)); ATTRIB(XonoticLanguageList, name, string, "languageselector") // change this to make it noninteractive (for first run dialog) ENDCLASS(XonoticLanguageList) diff --git a/qcsrc/menu/xonotic/listbox.qc b/qcsrc/menu/xonotic/listbox.qc index c4a092385..3ce6ed7cc 100644 --- a/qcsrc/menu/xonotic/listbox.qc +++ b/qcsrc/menu/xonotic/listbox.qc @@ -2,13 +2,13 @@ #define LISTBOX_H #include "../item/listbox.qc" CLASS(XonoticListBox, ListBox) - METHOD(XonoticListBox, configureXonoticListBox, void(entity)) + METHOD(XonoticListBox, configureXonoticListBox, void(entity)); ATTRIB(XonoticListBox, fontSize, float, SKINFONTSIZE_NORMAL) ATTRIB(XonoticListBox, scrollbarWidth, float, SKINWIDTH_SCROLLBAR) ATTRIB(XonoticListBox, src, string, SKINGFX_SCROLLBAR) ATTRIB(XonoticListBox, tolerance, vector, SKINTOLERANCE_SLIDER) ATTRIB(XonoticListBox, rowsPerItem, float, 1) - METHOD(XonoticListBox, resizeNotify, void(entity, vector, vector, vector, vector)) + METHOD(XonoticListBox, resizeNotify, void(entity, vector, vector, vector, vector)); ATTRIB(XonoticListBox, color, vector, SKINCOLOR_SCROLLBAR_N) ATTRIB(XonoticListBox, colorF, vector, SKINCOLOR_SCROLLBAR_F) ATTRIB(XonoticListBox, color2, vector, SKINCOLOR_SCROLLBAR_S) diff --git a/qcsrc/menu/xonotic/mainwindow.qc b/qcsrc/menu/xonotic/mainwindow.qc index 4ca94c9b0..eafa1842f 100644 --- a/qcsrc/menu/xonotic/mainwindow.qc +++ b/qcsrc/menu/xonotic/mainwindow.qc @@ -2,8 +2,8 @@ #define MAINWINDOW_H #include "../item/modalcontroller.qc" CLASS(MainWindow, ModalController) - METHOD(MainWindow, configureMainWindow, void(entity)) - METHOD(MainWindow, draw, void(entity)) + METHOD(MainWindow, configureMainWindow, void(entity)); + METHOD(MainWindow, draw, void(entity)); ATTRIB(MainWindow, firstRunDialog, entity, NULL) ATTRIB(MainWindow, advancedDialog, entity, NULL) ATTRIB(MainWindow, mutatorsDialog, entity, NULL) diff --git a/qcsrc/menu/xonotic/maplist.qc b/qcsrc/menu/xonotic/maplist.qc index a4cc0565c..384272ac8 100644 --- a/qcsrc/menu/xonotic/maplist.qc +++ b/qcsrc/menu/xonotic/maplist.qc @@ -2,16 +2,16 @@ #define MAPLIST_H #include "listbox.qc" CLASS(XonoticMapList, XonoticListBox) - METHOD(XonoticMapList, configureXonoticMapList, void(entity)) + METHOD(XonoticMapList, configureXonoticMapList, void(entity)); ATTRIB(XonoticMapList, rowsPerItem, float, 4) - METHOD(XonoticMapList, draw, void(entity)) - METHOD(XonoticMapList, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticMapList, clickListBoxItem, void(entity, float, vector)) - METHOD(XonoticMapList, doubleClickListBoxItem, void(entity, float, vector)) - METHOD(XonoticMapList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticMapList, refilter, void(entity)) - METHOD(XonoticMapList, refilterCallback, void(entity, entity)) - METHOD(XonoticMapList, keyDown, float(entity, float, float, float)) + METHOD(XonoticMapList, draw, void(entity)); + METHOD(XonoticMapList, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticMapList, clickListBoxItem, void(entity, float, vector)); + METHOD(XonoticMapList, doubleClickListBoxItem, void(entity, float, vector)); + METHOD(XonoticMapList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticMapList, refilter, void(entity)); + METHOD(XonoticMapList, refilterCallback, void(entity, entity)); + METHOD(XonoticMapList, keyDown, float(entity, float, float, float)); ATTRIB(XonoticMapList, realFontSize, vector, '0 0 0') ATTRIB(XonoticMapList, columnPreviewOrigin, float, 0) @@ -30,20 +30,20 @@ CLASS(XonoticMapList, XonoticListBox) ATTRIB(XonoticMapList, itemAbsSize, vector, '0 0 0') ATTRIB(XonoticMapList, g_maplistCache, string, string_null) - METHOD(XonoticMapList, g_maplistCacheToggle, void(entity, float)) - METHOD(XonoticMapList, g_maplistCacheQuery, float(entity, float)) + METHOD(XonoticMapList, g_maplistCacheToggle, void(entity, float)); + METHOD(XonoticMapList, g_maplistCacheQuery, float(entity, float)); ATTRIB(XonoticMapList, stringFilter, string, string_null) ATTRIB(XonoticMapList, stringFilterBox, entity, NULL) ATTRIB(XonoticMapList, startButton, entity, NULL) - METHOD(XonoticMapList, loadCvars, void(entity)) + METHOD(XonoticMapList, loadCvars, void(entity)); ATTRIB(XonoticMapList, typeToSearchString, string, string_null) ATTRIB(XonoticMapList, typeToSearchTime, float, 0) - METHOD(XonoticMapList, destroy, void(entity)) + METHOD(XonoticMapList, destroy, void(entity)); ATTRIB(XonoticMapList, alphaBG, float, 0) ENDCLASS(XonoticMapList) diff --git a/qcsrc/menu/xonotic/nexposee.qc b/qcsrc/menu/xonotic/nexposee.qc index 966b11a98..0d302eba8 100644 --- a/qcsrc/menu/xonotic/nexposee.qc +++ b/qcsrc/menu/xonotic/nexposee.qc @@ -2,8 +2,8 @@ #define NEXPOSEE_H #include "../item/nexposee.qc" CLASS(XonoticNexposee, Nexposee) - METHOD(XonoticNexposee, configureXonoticNexposee, void(entity)) - METHOD(XonoticNexposee, close, void(entity)) + METHOD(XonoticNexposee, configureXonoticNexposee, void(entity)); + METHOD(XonoticNexposee, close, void(entity)); ENDCLASS(XonoticNexposee) entity makeXonoticNexposee(); #endif diff --git a/qcsrc/menu/xonotic/picker.qc b/qcsrc/menu/xonotic/picker.qc index dd574676e..24e5b2f5c 100644 --- a/qcsrc/menu/xonotic/picker.qc +++ b/qcsrc/menu/xonotic/picker.qc @@ -2,13 +2,13 @@ #define PICKER_H #include "../item.qc" CLASS(XonoticPicker, Item) - METHOD(XonoticPicker, configureXonoticPicker, void(entity)) - METHOD(XonoticPicker, mousePress, float(entity, vector)) - METHOD(XonoticPicker, mouseRelease, float(entity, vector)) - METHOD(XonoticPicker, mouseMove, float(entity, vector)) - METHOD(XonoticPicker, mouseDrag, float(entity, vector)) - METHOD(XonoticPicker, keyDown, float(entity, float, float, float)) - METHOD(XonoticPicker, draw, void(entity)) + METHOD(XonoticPicker, configureXonoticPicker, void(entity)); + METHOD(XonoticPicker, mousePress, float(entity, vector)); + METHOD(XonoticPicker, mouseRelease, float(entity, vector)); + METHOD(XonoticPicker, mouseMove, float(entity, vector)); + METHOD(XonoticPicker, mouseDrag, float(entity, vector)); + METHOD(XonoticPicker, keyDown, float(entity, float, float, float)); + METHOD(XonoticPicker, draw, void(entity)); ATTRIB(XonoticPicker, focusable, float, 1) ATTRIB(XonoticPicker, disabled, float, 0) ATTRIB(XonoticPicker, alpha, float, 1) @@ -17,10 +17,10 @@ CLASS(XonoticPicker, Item) ATTRIB(XonoticPicker, rows, float, 3) ATTRIB(XonoticPicker, columns, float, 2) - METHOD(XonoticPicker, moveFocus, void(entity, vector, vector)) - METHOD(XonoticPicker, cellSelect, void(entity, vector)) - METHOD(XonoticPicker, cellDraw, void(entity, vector, vector)) - METHOD(XonoticPicker, cellIsValid, bool(entity, vector)) + METHOD(XonoticPicker, moveFocus, void(entity, vector, vector)); + METHOD(XonoticPicker, cellSelect, void(entity, vector)); + METHOD(XonoticPicker, cellDraw, void(entity, vector, vector)); + METHOD(XonoticPicker, cellIsValid, bool(entity, vector)); ATTRIB(XonoticPicker, realCellSize, vector, '0 0 0') ATTRIB(XonoticPicker, selectedCell, vector, '-1 -1 0') ATTRIB(XonoticPicker, focusedCell, vector, '-1 -1 0') diff --git a/qcsrc/menu/xonotic/playerlist.qc b/qcsrc/menu/xonotic/playerlist.qc index 72fe69e11..9ba5d8738 100644 --- a/qcsrc/menu/xonotic/playerlist.qc +++ b/qcsrc/menu/xonotic/playerlist.qc @@ -3,8 +3,8 @@ #include "listbox.qc" CLASS(XonoticPlayerList, XonoticListBox) ATTRIB(XonoticPlayerList, rowsPerItem, float, 1) - METHOD(XonoticPlayerList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticPlayerList, drawListBoxItem, void(entity, int, vector, bool, bool)) + METHOD(XonoticPlayerList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticPlayerList, drawListBoxItem, void(entity, int, vector, bool, bool)); ATTRIB(XonoticPlayerList, allowFocusSound, float, 0) ATTRIB(XonoticPlayerList, realFontSize, vector, '0 0 0') ATTRIB(XonoticPlayerList, columnNameOrigin, float, 0) @@ -14,8 +14,8 @@ CLASS(XonoticPlayerList, XonoticListBox) ATTRIB(XonoticPlayerList, realUpperMargin, float, 0) ATTRIB(XonoticPlayerList, origin, vector, '0 0 0') ATTRIB(XonoticPlayerList, itemAbsSize, vector, '0 0 0') - METHOD(XonoticPlayerList, setPlayerList, void(entity, string)) - METHOD(XonoticPlayerList, getPlayerList, string(entity, float, float)) + METHOD(XonoticPlayerList, setPlayerList, void(entity, string)); + METHOD(XonoticPlayerList, getPlayerList, string(entity, float, float)); ATTRIB(XonoticPlayerList, playerList, float, -1) ATTRIB(XonoticPlayerList, selectionDoesntMatter, bool, true) ENDCLASS(XonoticPlayerList) diff --git a/qcsrc/menu/xonotic/playermodel.qc b/qcsrc/menu/xonotic/playermodel.qc index 760e8f93d..c5ad21ec1 100644 --- a/qcsrc/menu/xonotic/playermodel.qc +++ b/qcsrc/menu/xonotic/playermodel.qc @@ -2,19 +2,19 @@ #define PLAYERMODEL_H #include "image.qc" CLASS(XonoticPlayerModelSelector, XonoticImage) - METHOD(XonoticPlayerModelSelector, configureXonoticPlayerModelSelector, void(entity)) - METHOD(XonoticPlayerModelSelector, loadCvars, void(entity)) - METHOD(XonoticPlayerModelSelector, saveCvars, void(entity)) - METHOD(XonoticPlayerModelSelector, draw, void(entity)) - METHOD(XonoticPlayerModelSelector, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticPlayerModelSelector, showNotify, void(entity)) + METHOD(XonoticPlayerModelSelector, configureXonoticPlayerModelSelector, void(entity)); + METHOD(XonoticPlayerModelSelector, loadCvars, void(entity)); + METHOD(XonoticPlayerModelSelector, saveCvars, void(entity)); + METHOD(XonoticPlayerModelSelector, draw, void(entity)); + METHOD(XonoticPlayerModelSelector, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticPlayerModelSelector, showNotify, void(entity)); ATTRIB(XonoticPlayerModelSelector, currentModel, string, string_null) ATTRIB(XonoticPlayerModelSelector, currentSkin, float, 0) ATTRIB(XonoticPlayerModelSelector, currentModelImage, string, string_null) ATTRIB(XonoticPlayerModelSelector, currentModelTitle, string, string_null) ATTRIB(XonoticPlayerModelSelector, currentModelDescription, string, string_null) - METHOD(XonoticPlayerModelSelector, go, void(entity, float)) - METHOD(XonoticPlayerModelSelector, destroy, void(entity)) + METHOD(XonoticPlayerModelSelector, go, void(entity, float)); + METHOD(XonoticPlayerModelSelector, destroy, void(entity)); ATTRIB(XonoticPlayerModelSelector, origin, vector, '0 0 0') ATTRIB(XonoticPlayerModelSelector, size, vector, '0 0 0') ATTRIB(XonoticPlayerModelSelector, realFontSize, vector, '0 0 0') diff --git a/qcsrc/menu/xonotic/playlist.qc b/qcsrc/menu/xonotic/playlist.qc index 5dd7b6b92..0393215f8 100644 --- a/qcsrc/menu/xonotic/playlist.qc +++ b/qcsrc/menu/xonotic/playlist.qc @@ -2,21 +2,21 @@ #define PLAYLIST_H #include "listbox.qc" CLASS(XonoticPlayList, XonoticListBox) - METHOD(XonoticPlayList, configureXonoticPlayList, void(entity)) + METHOD(XonoticPlayList, configureXonoticPlayList, void(entity)); ATTRIB(XonoticPlayList, rowsPerItem, float, 1) - METHOD(XonoticPlayList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticPlayList, draw, void(entity)) - METHOD(XonoticPlayList, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticPlayList, stopSound, void(entity)) - METHOD(XonoticPlayList, startSound, void(entity, float)) - METHOD(XonoticPlayList, resumeSound, void(entity)) - METHOD(XonoticPlayList, pauseSound, void(entity)) - METHOD(XonoticPlayList, doubleClickListBoxItem, void(entity, float, vector)) - METHOD(XonoticPlayList, keyDown, float(entity, float, float, float)) - METHOD(XonoticPlayList, mouseDrag, float(entity, vector)) - - METHOD(XonoticPlayList, addToPlayList, void(entity, string)) - METHOD(XonoticPlayList, removeSelectedFromPlayList, void(entity)) + METHOD(XonoticPlayList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticPlayList, draw, void(entity)); + METHOD(XonoticPlayList, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticPlayList, stopSound, void(entity)); + METHOD(XonoticPlayList, startSound, void(entity, float)); + METHOD(XonoticPlayList, resumeSound, void(entity)); + METHOD(XonoticPlayList, pauseSound, void(entity)); + METHOD(XonoticPlayList, doubleClickListBoxItem, void(entity, float, vector)); + METHOD(XonoticPlayList, keyDown, float(entity, float, float, float)); + METHOD(XonoticPlayList, mouseDrag, float(entity, vector)); + + METHOD(XonoticPlayList, addToPlayList, void(entity, string)); + METHOD(XonoticPlayList, removeSelectedFromPlayList, void(entity)); ATTRIB(XonoticPlayList, playingTrack, float, -1) ATTRIB(XonoticPlayList, realFontSize, vector, '0 0 0') diff --git a/qcsrc/menu/xonotic/radiobutton.qc b/qcsrc/menu/xonotic/radiobutton.qc index 05c8238d4..1d2676f1f 100644 --- a/qcsrc/menu/xonotic/radiobutton.qc +++ b/qcsrc/menu/xonotic/radiobutton.qc @@ -2,9 +2,9 @@ #define RADIOBUTTON_H #include "../item/radiobutton.qc" CLASS(XonoticRadioButton, RadioButton) - METHOD(XonoticRadioButton, configureXonoticRadioButton, void(entity, float, string, string, string)) - METHOD(XonoticRadioButton, draw, void(entity)) - METHOD(XonoticRadioButton, setChecked, void(entity, float)) + METHOD(XonoticRadioButton, configureXonoticRadioButton, void(entity, float, string, string, string)); + METHOD(XonoticRadioButton, draw, void(entity)); + METHOD(XonoticRadioButton, setChecked, void(entity, float)); ATTRIB(XonoticRadioButton, fontSize, float, SKINFONTSIZE_NORMAL) ATTRIB(XonoticRadioButton, image, string, SKINGFX_RADIOBUTTON) ATTRIB(XonoticRadioButton, color, vector, SKINCOLOR_RADIOBUTTON_N) @@ -16,8 +16,8 @@ CLASS(XonoticRadioButton, RadioButton) ATTRIB(XonoticRadioButton, cvarValue, string, string_null) ATTRIB(XonoticRadioButton, cvarOffValue, string, string_null) ATTRIB(XonoticRadioButton, getCvarValueFromCvar, float, 0) - METHOD(XonoticRadioButton, loadCvars, void(entity)) - METHOD(XonoticRadioButton, saveCvars, void(entity)) + METHOD(XonoticRadioButton, loadCvars, void(entity)); + METHOD(XonoticRadioButton, saveCvars, void(entity)); ATTRIB(XonoticRadioButton, alpha, float, SKINALPHA_TEXT) ATTRIB(XonoticRadioButton, disabledAlpha, float, SKINALPHA_DISABLED) diff --git a/qcsrc/menu/xonotic/rootdialog.qc b/qcsrc/menu/xonotic/rootdialog.qc index 209fcade8..f074a6286 100644 --- a/qcsrc/menu/xonotic/rootdialog.qc +++ b/qcsrc/menu/xonotic/rootdialog.qc @@ -11,7 +11,7 @@ CLASS(XonoticRootDialog, XonoticDialog) ATTRIB(XonoticDialog, rows, float, 3) ATTRIB(XonoticDialog, columns, float, 2) */ - METHOD(XonoticRootDialog, close, void(entity)) + METHOD(XonoticRootDialog, close, void(entity)); ENDCLASS(XonoticRootDialog) #endif diff --git a/qcsrc/menu/xonotic/screenshotimage.qc b/qcsrc/menu/xonotic/screenshotimage.qc index f2eb0b00d..f7a5c9b30 100644 --- a/qcsrc/menu/xonotic/screenshotimage.qc +++ b/qcsrc/menu/xonotic/screenshotimage.qc @@ -2,14 +2,14 @@ #define SCREENSHOTIMAGE_H #include "image.qc" CLASS(XonoticScreenshotImage, XonoticImage) - METHOD(XonoticScreenshotImage, configureXonoticScreenshotImage, void(entity)) - METHOD(XonoticScreenshotImage, load, void(entity, string)) - METHOD(XonoticScreenshotImage, draw, void(entity)) + METHOD(XonoticScreenshotImage, configureXonoticScreenshotImage, void(entity)); + METHOD(XonoticScreenshotImage, load, void(entity, string)); + METHOD(XonoticScreenshotImage, draw, void(entity)); ATTRIB(XonoticScreenshotImage, focusable, float, 1) // mousePress and mouseDrag work only if focusable is set - METHOD(XonoticScreenshotImage, mousePress, float(entity, vector)) - METHOD(XonoticScreenshotImage, mouseDrag, float(entity, vector)) - METHOD(XonoticScreenshotImage, mouseMove, float(entity, vector)) - METHOD(XonoticScreenshotImage, resizeNotify, void(entity, vector, vector, vector, vector)) + METHOD(XonoticScreenshotImage, mousePress, float(entity, vector)); + METHOD(XonoticScreenshotImage, mouseDrag, float(entity, vector)); + METHOD(XonoticScreenshotImage, mouseMove, float(entity, vector)); + METHOD(XonoticScreenshotImage, resizeNotify, void(entity, vector, vector, vector, vector)); ATTRIB(XonoticScreenshotImage, realFontSize, vector, '0 0 0') ATTRIB(XonoticScreenshotImage, fontSize, float, SKINFONTSIZE_NORMAL) ATTRIB(XonoticScreenshotImage, showTitle, float, 1) diff --git a/qcsrc/menu/xonotic/screenshotlist.qc b/qcsrc/menu/xonotic/screenshotlist.qc index 99780ed83..e7693a2e3 100644 --- a/qcsrc/menu/xonotic/screenshotlist.qc +++ b/qcsrc/menu/xonotic/screenshotlist.qc @@ -2,20 +2,20 @@ #define SCREENSHOTLIST_H #include "listbox.qc" CLASS(XonoticScreenshotList, XonoticListBox) - METHOD(XonoticScreenshotList, configureXonoticScreenshotList, void(entity)) + METHOD(XonoticScreenshotList, configureXonoticScreenshotList, void(entity)); ATTRIB(XonoticScreenshotList, rowsPerItem, float, 1) - METHOD(XonoticScreenshotList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticScreenshotList, setSelected, void(entity, float)) - METHOD(XonoticScreenshotList, draw, void(entity)) - METHOD(XonoticScreenshotList, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticScreenshotList, getScreenshots, void(entity)) - METHOD(XonoticScreenshotList, previewScreenshot, void(entity)) - METHOD(XonoticScreenshotList, startScreenshot, void(entity)) - METHOD(XonoticScreenshotList, screenshotName, string(entity, float)) - METHOD(XonoticScreenshotList, doubleClickListBoxItem, void(entity, float, vector)) - METHOD(XonoticScreenshotList, keyDown, float(entity, float, float, float)) - METHOD(XonoticScreenshotList, destroy, void(entity)) - METHOD(XonoticScreenshotList, showNotify, void(entity)) + METHOD(XonoticScreenshotList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticScreenshotList, setSelected, void(entity, float)); + METHOD(XonoticScreenshotList, draw, void(entity)); + METHOD(XonoticScreenshotList, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticScreenshotList, getScreenshots, void(entity)); + METHOD(XonoticScreenshotList, previewScreenshot, void(entity)); + METHOD(XonoticScreenshotList, startScreenshot, void(entity)); + METHOD(XonoticScreenshotList, screenshotName, string(entity, float)); + METHOD(XonoticScreenshotList, doubleClickListBoxItem, void(entity, float, vector)); + METHOD(XonoticScreenshotList, keyDown, float(entity, float, float, float)); + METHOD(XonoticScreenshotList, destroy, void(entity)); + METHOD(XonoticScreenshotList, showNotify, void(entity)); ATTRIB(XonoticScreenshotList, listScreenshot, float, -1) ATTRIB(XonoticScreenshotList, realFontSize, vector, '0 0 0') ATTRIB(XonoticScreenshotList, columnNameOrigin, float, 0) @@ -33,9 +33,9 @@ CLASS(XonoticScreenshotList, XonoticListBox) ATTRIB(XonoticScreenshotList, screenshotBrowserDialog, entity, NULL) ATTRIB(XonoticScreenshotList, screenshotPreview, entity, NULL) ATTRIB(XonoticScreenshotList, screenshotViewerDialog, entity, NULL) - METHOD(XonoticScreenshotList, goScreenshot, void(entity, float)) - METHOD(XonoticScreenshotList, startSlideShow, void(entity)) - METHOD(XonoticScreenshotList, stopSlideShow, void(entity)) + METHOD(XonoticScreenshotList, goScreenshot, void(entity, float)); + METHOD(XonoticScreenshotList, startSlideShow, void(entity)); + METHOD(XonoticScreenshotList, stopSlideShow, void(entity)); ENDCLASS(XonoticScreenshotList) entity makeXonoticScreenshotList(); diff --git a/qcsrc/menu/xonotic/serverlist.qc b/qcsrc/menu/xonotic/serverlist.qc index 8d53be8fb..c72db26bb 100644 --- a/qcsrc/menu/xonotic/serverlist.qc +++ b/qcsrc/menu/xonotic/serverlist.qc @@ -2,14 +2,14 @@ #define SERVERLIST_H #include "listbox.qc" CLASS(XonoticServerList, XonoticListBox) - METHOD(XonoticServerList, configureXonoticServerList, void(entity)) + METHOD(XonoticServerList, configureXonoticServerList, void(entity)); ATTRIB(XonoticServerList, rowsPerItem, float, 1) - METHOD(XonoticServerList, draw, void(entity)) - METHOD(XonoticServerList, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticServerList, doubleClickListBoxItem, void(entity, float, vector)) - METHOD(XonoticServerList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticServerList, keyDown, float(entity, float, float, float)) - METHOD(XonoticServerList, toggleFavorite, void(entity, string)) + METHOD(XonoticServerList, draw, void(entity)); + METHOD(XonoticServerList, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticServerList, doubleClickListBoxItem, void(entity, float, vector)); + METHOD(XonoticServerList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticServerList, keyDown, float(entity, float, float, float)); + METHOD(XonoticServerList, toggleFavorite, void(entity, string)); ATTRIB(XonoticServerList, iconsSizeFactor, float, 0.85) @@ -30,8 +30,8 @@ CLASS(XonoticServerList, XonoticListBox) ATTRIB(XonoticServerList, lockedSelectedItem, bool, true) // initially keep selected the first item of the list, avoiding an unwanted scrolling ATTRIB(XonoticServerList, selectedServer, string, string_null) // to restore selected server when needed - METHOD(XonoticServerList, setSelected, void(entity, float)) - METHOD(XonoticServerList, setSortOrder, void(entity, float, float)) + METHOD(XonoticServerList, setSelected, void(entity, float)); + METHOD(XonoticServerList, setSortOrder, void(entity, float, float)); ATTRIB(XonoticServerList, filterShowEmpty, float, 1) ATTRIB(XonoticServerList, filterShowFull, float, 1) ATTRIB(XonoticServerList, filterString, string, string_null) @@ -39,10 +39,10 @@ CLASS(XonoticServerList, XonoticListBox) ATTRIB(XonoticServerList, ipAddressBox, entity, NULL) ATTRIB(XonoticServerList, favoriteButton, entity, NULL) ATTRIB(XonoticServerList, nextRefreshTime, float, 0) - METHOD(XonoticServerList, refreshServerList, void(entity, float)) // refresh mode: REFRESHSERVERLIST_* + METHOD(XonoticServerList, refreshServerList, void(entity, float)); // refresh mode: REFRESHSERVERLIST_* ATTRIB(XonoticServerList, needsRefresh, float, 1) - METHOD(XonoticServerList, focusEnter, void(entity)) - METHOD(XonoticServerList, positionSortButton, void(entity, entity, float, float, string, void(entity, entity))) + METHOD(XonoticServerList, focusEnter, void(entity)); + METHOD(XonoticServerList, positionSortButton, void(entity, entity, float, float, string, void(entity, entity))); ATTRIB(XonoticServerList, sortButton1, entity, NULL) ATTRIB(XonoticServerList, sortButton2, entity, NULL) ATTRIB(XonoticServerList, sortButton3, entity, NULL) @@ -59,10 +59,10 @@ CLASS(XonoticServerList, XonoticListBox) ATTRIB(XonoticServerList, seenIPv6, float, 0) ATTRIB(XonoticServerList, categoriesHeight, float, 1.25) - METHOD(XonoticServerList, getTotalHeight, float(entity)) - METHOD(XonoticServerList, getItemAtPos, float(entity, float)) - METHOD(XonoticServerList, getItemStart, float(entity, float)) - METHOD(XonoticServerList, getItemHeight, float(entity, float)) + METHOD(XonoticServerList, getTotalHeight, float(entity)); + METHOD(XonoticServerList, getItemAtPos, float(entity, float)); + METHOD(XonoticServerList, getItemStart, float(entity, float)); + METHOD(XonoticServerList, getItemHeight, float(entity, float)); ENDCLASS(XonoticServerList) entity makeXonoticServerList(); diff --git a/qcsrc/menu/xonotic/skinlist.qc b/qcsrc/menu/xonotic/skinlist.qc index d505a2894..1a5f754db 100644 --- a/qcsrc/menu/xonotic/skinlist.qc +++ b/qcsrc/menu/xonotic/skinlist.qc @@ -2,18 +2,18 @@ #define SKINLIST_H #include "listbox.qc" CLASS(XonoticSkinList, XonoticListBox) - METHOD(XonoticSkinList, configureXonoticSkinList, void(entity)) + METHOD(XonoticSkinList, configureXonoticSkinList, void(entity)); ATTRIB(XonoticSkinList, rowsPerItem, float, 4) - METHOD(XonoticSkinList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticSkinList, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticSkinList, getSkins, void(entity)) - METHOD(XonoticSkinList, setSkin, void(entity)) - METHOD(XonoticSkinList, loadCvars, void(entity)) - METHOD(XonoticSkinList, saveCvars, void(entity)) - METHOD(XonoticSkinList, skinParameter, string(entity, float, float)) - METHOD(XonoticSkinList, doubleClickListBoxItem, void(entity, float, vector)) - METHOD(XonoticSkinList, keyDown, float(entity, float, float, float)) - METHOD(XonoticSkinList, destroy, void(entity)) + METHOD(XonoticSkinList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticSkinList, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticSkinList, getSkins, void(entity)); + METHOD(XonoticSkinList, setSkin, void(entity)); + METHOD(XonoticSkinList, loadCvars, void(entity)); + METHOD(XonoticSkinList, saveCvars, void(entity)); + METHOD(XonoticSkinList, skinParameter, string(entity, float, float)); + METHOD(XonoticSkinList, doubleClickListBoxItem, void(entity, float, vector)); + METHOD(XonoticSkinList, keyDown, float(entity, float, float, float)); + METHOD(XonoticSkinList, destroy, void(entity)); ATTRIB(XonoticSkinList, skinlist, float, -1) ATTRIB(XonoticSkinList, realFontSize, vector, '0 0 0') diff --git a/qcsrc/menu/xonotic/slider.qc b/qcsrc/menu/xonotic/slider.qc index d95cac7e9..46379d5a3 100644 --- a/qcsrc/menu/xonotic/slider.qc +++ b/qcsrc/menu/xonotic/slider.qc @@ -2,8 +2,8 @@ #define SLIDER_H #include "../item/slider.qc" CLASS(XonoticSlider, Slider) - METHOD(XonoticSlider, configureXonoticSlider, void(entity, float, float, float, string)) - METHOD(XonoticSlider, setValue, void(entity, float)) + METHOD(XonoticSlider, configureXonoticSlider, void(entity, float, float, float, string)); + METHOD(XonoticSlider, setValue, void(entity, float)); ATTRIB(XonoticSlider, fontSize, float, SKINFONTSIZE_NORMAL) ATTRIB(XonoticSlider, valueSpace, float, SKINWIDTH_SLIDERTEXT) ATTRIB(XonoticSlider, image, string, SKINGFX_SLIDER) @@ -16,8 +16,8 @@ CLASS(XonoticSlider, Slider) ATTRIB(XonoticSlider, color2, vector, SKINCOLOR_SLIDER_S) ATTRIB(XonoticSlider, cvarName, string, string_null) - METHOD(XonoticSlider, loadCvars, void(entity)) - METHOD(XonoticSlider, saveCvars, void(entity)) + METHOD(XonoticSlider, loadCvars, void(entity)); + METHOD(XonoticSlider, saveCvars, void(entity)); ATTRIB(XonoticSlider, sendCvars, float, 0) ATTRIB(XonoticSlider, alpha, float, SKINALPHA_TEXT) diff --git a/qcsrc/menu/xonotic/slider_decibels.qc b/qcsrc/menu/xonotic/slider_decibels.qc index 29d2a86ac..3d8cf1da4 100644 --- a/qcsrc/menu/xonotic/slider_decibels.qc +++ b/qcsrc/menu/xonotic/slider_decibels.qc @@ -4,9 +4,9 @@ #define SLIDER_DECIBELS_H #include "slider.qc" CLASS(XonoticDecibelsSlider, XonoticSlider) - METHOD(XonoticDecibelsSlider, loadCvars, void(entity)) - METHOD(XonoticDecibelsSlider, saveCvars, void(entity)) - METHOD(XonoticDecibelsSlider, valueToText, string(entity, float)) + METHOD(XonoticDecibelsSlider, loadCvars, void(entity)); + METHOD(XonoticDecibelsSlider, saveCvars, void(entity)); + METHOD(XonoticDecibelsSlider, valueToText, string(entity, float)); ENDCLASS(XonoticDecibelsSlider) entity makeXonoticDecibelsSlider(float, float, float, string); #endif diff --git a/qcsrc/menu/xonotic/slider_particles.qc b/qcsrc/menu/xonotic/slider_particles.qc index 9a098165e..f7acdfeca 100644 --- a/qcsrc/menu/xonotic/slider_particles.qc +++ b/qcsrc/menu/xonotic/slider_particles.qc @@ -2,9 +2,9 @@ #define SLIDER_PARTICLES_H #include "textslider.qc" CLASS(XonoticParticlesSlider, XonoticTextSlider) - METHOD(XonoticParticlesSlider, configureXonoticParticlesSlider, void(entity)) - METHOD(XonoticParticlesSlider, loadCvars, void(entity)) - METHOD(XonoticParticlesSlider, saveCvars, void(entity)) + METHOD(XonoticParticlesSlider, configureXonoticParticlesSlider, void(entity)); + METHOD(XonoticParticlesSlider, loadCvars, void(entity)); + METHOD(XonoticParticlesSlider, saveCvars, void(entity)); ENDCLASS(XonoticParticlesSlider) entity makeXonoticParticlesSlider(); #endif diff --git a/qcsrc/menu/xonotic/slider_picmip.qc b/qcsrc/menu/xonotic/slider_picmip.qc index f663f7dd6..7c1dec045 100644 --- a/qcsrc/menu/xonotic/slider_picmip.qc +++ b/qcsrc/menu/xonotic/slider_picmip.qc @@ -2,9 +2,9 @@ #define SLIDER_PICMIP_H #include "textslider.qc" CLASS(XonoticPicmipSlider, XonoticTextSlider) - METHOD(XonoticPicmipSlider, configureXonoticPicmipSlider, void(entity)) - METHOD(XonoticPicmipSlider, draw, void(entity)) - METHOD(XonoticPicmipSlider, autofix, void(entity)) + METHOD(XonoticPicmipSlider, configureXonoticPicmipSlider, void(entity)); + METHOD(XonoticPicmipSlider, draw, void(entity)); + METHOD(XonoticPicmipSlider, autofix, void(entity)); ATTRIB(XonoticPicmipSlider, have_s3tc, float, 0) ENDCLASS(XonoticPicmipSlider) entity makeXonoticPicmipSlider(); // note: you still need to call addValue and configureXonoticTextSliderValues! diff --git a/qcsrc/menu/xonotic/slider_resolution.qc b/qcsrc/menu/xonotic/slider_resolution.qc index 3d1f8302f..1857621b4 100644 --- a/qcsrc/menu/xonotic/slider_resolution.qc +++ b/qcsrc/menu/xonotic/slider_resolution.qc @@ -2,12 +2,12 @@ #define SLIDER_RESOLUTION_H #include "textslider.qc" CLASS(XonoticResolutionSlider, XonoticTextSlider) - METHOD(XonoticResolutionSlider, configureXonoticResolutionSlider, void(entity)) - METHOD(XonoticResolutionSlider, loadResolutions, void(entity, float)) - METHOD(XonoticResolutionSlider, addResolution, void(entity, float, float, float)) - METHOD(XonoticResolutionSlider, loadCvars, void(entity)) - METHOD(XonoticResolutionSlider, saveCvars, void(entity)) - METHOD(XonoticResolutionSlider, draw, void(entity)) + METHOD(XonoticResolutionSlider, configureXonoticResolutionSlider, void(entity)); + METHOD(XonoticResolutionSlider, loadResolutions, void(entity, float)); + METHOD(XonoticResolutionSlider, addResolution, void(entity, float, float, float)); + METHOD(XonoticResolutionSlider, loadCvars, void(entity)); + METHOD(XonoticResolutionSlider, saveCvars, void(entity)); + METHOD(XonoticResolutionSlider, draw, void(entity)); ATTRIB(XonoticResolutionSlider, vid_fullscreen, float, -1) ATTRIB(XonoticResolutionSlider, maxAllowedWidth, float, 0) ATTRIB(XonoticResolutionSlider, maxAllowedHeight, float, 0) diff --git a/qcsrc/menu/xonotic/slider_sbfadetime.qc b/qcsrc/menu/xonotic/slider_sbfadetime.qc index 4d30c64f0..d64a990d2 100644 --- a/qcsrc/menu/xonotic/slider_sbfadetime.qc +++ b/qcsrc/menu/xonotic/slider_sbfadetime.qc @@ -2,9 +2,9 @@ #define SLIDER_SBFADETIME_H #include "textslider.qc" CLASS(XonoticScoreboardFadeTimeSlider, XonoticTextSlider) - METHOD(XonoticScoreboardFadeTimeSlider, configureXonoticScoreboardFadeTimeSlider, void(entity)) - METHOD(XonoticScoreboardFadeTimeSlider, loadCvars, void(entity)) - METHOD(XonoticScoreboardFadeTimeSlider, saveCvars, void(entity)) + METHOD(XonoticScoreboardFadeTimeSlider, configureXonoticScoreboardFadeTimeSlider, void(entity)); + METHOD(XonoticScoreboardFadeTimeSlider, loadCvars, void(entity)); + METHOD(XonoticScoreboardFadeTimeSlider, saveCvars, void(entity)); ENDCLASS(XonoticScoreboardFadeTimeSlider) entity makeXonoticScoreboardFadeTimeSlider(); #endif diff --git a/qcsrc/menu/xonotic/soundlist.qc b/qcsrc/menu/xonotic/soundlist.qc index 2b98c5fe5..6d2835268 100644 --- a/qcsrc/menu/xonotic/soundlist.qc +++ b/qcsrc/menu/xonotic/soundlist.qc @@ -2,16 +2,16 @@ #define SOUNDLIST_H #include "listbox.qc" CLASS(XonoticSoundList, XonoticListBox) - METHOD(XonoticSoundList, configureXonoticSoundList, void(entity)) + METHOD(XonoticSoundList, configureXonoticSoundList, void(entity)); ATTRIB(XonoticSoundList, rowsPerItem, float, 1) - METHOD(XonoticSoundList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticSoundList, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticSoundList, getSounds, void(entity)) - METHOD(XonoticSoundList, soundName, string(entity, float)) - METHOD(XonoticSoundList, doubleClickListBoxItem, void(entity, float, vector)) - METHOD(XonoticSoundList, keyDown, float(entity, float, float, float)) - METHOD(XonoticSoundList, destroy, void(entity)) - METHOD(XonoticSoundList, showNotify, void(entity)) + METHOD(XonoticSoundList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticSoundList, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticSoundList, getSounds, void(entity)); + METHOD(XonoticSoundList, soundName, string(entity, float)); + METHOD(XonoticSoundList, doubleClickListBoxItem, void(entity, float, vector)); + METHOD(XonoticSoundList, keyDown, float(entity, float, float, float)); + METHOD(XonoticSoundList, destroy, void(entity)); + METHOD(XonoticSoundList, showNotify, void(entity)); ATTRIB(XonoticSoundList, listSound, float, -1) ATTRIB(XonoticSoundList, realFontSize, vector, '0 0 0') diff --git a/qcsrc/menu/xonotic/statslist.qc b/qcsrc/menu/xonotic/statslist.qc index bfa050abd..db42177fb 100644 --- a/qcsrc/menu/xonotic/statslist.qc +++ b/qcsrc/menu/xonotic/statslist.qc @@ -5,15 +5,15 @@ #define STATSLIST_H #include "listbox.qc" CLASS(XonoticStatsList, XonoticListBox) - METHOD(XonoticStatsList, configureXonoticStatsList, void(entity)) + METHOD(XonoticStatsList, configureXonoticStatsList, void(entity)); ATTRIB(XonoticStatsList, rowsPerItem, float, 1.4) - METHOD(XonoticStatsList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticStatsList, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticStatsList, getStats, void(entity)) - METHOD(XonoticStatsList, doubleClickListBoxItem, void(entity, float, vector)) - METHOD(XonoticStatsList, keyDown, float(entity, float, float, float)) - METHOD(XonoticStatsList, destroy, void(entity)) - METHOD(XonoticStatsList, showNotify, void(entity)) + METHOD(XonoticStatsList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticStatsList, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticStatsList, getStats, void(entity)); + METHOD(XonoticStatsList, doubleClickListBoxItem, void(entity, float, vector)); + METHOD(XonoticStatsList, keyDown, float(entity, float, float, float)); + METHOD(XonoticStatsList, destroy, void(entity)); + METHOD(XonoticStatsList, showNotify, void(entity)); ATTRIB(XonoticStatsList, selectionDoesntMatter, bool, true) ATTRIB(XonoticStatsList, listStats, float, -1) diff --git a/qcsrc/menu/xonotic/tab.qc b/qcsrc/menu/xonotic/tab.qc index 0383c7aae..03a5bc5fe 100644 --- a/qcsrc/menu/xonotic/tab.qc +++ b/qcsrc/menu/xonotic/tab.qc @@ -8,7 +8,7 @@ CLASS(XonoticTab, Tab) ATTRIB(XonoticTab, rows, float, 3) ATTRIB(XonoticTab, columns, float, 2) */ - METHOD(XonoticTab, showNotify, void(entity)) + METHOD(XonoticTab, showNotify, void(entity)); ATTRIB(XonoticTab, marginTop, float, 0) // pixels ATTRIB(XonoticTab, marginBottom, float, 0) // pixels diff --git a/qcsrc/menu/xonotic/tabcontroller.qc b/qcsrc/menu/xonotic/tabcontroller.qc index c95424b17..ec30b9c2d 100644 --- a/qcsrc/menu/xonotic/tabcontroller.qc +++ b/qcsrc/menu/xonotic/tabcontroller.qc @@ -2,8 +2,8 @@ #define TABCONTROLLER_H #include "../item/modalcontroller.qc" CLASS(XonoticTabController, ModalController) - METHOD(XonoticTabController, configureXonoticTabController, void(entity, float)) - METHOD(XonoticTabController, makeTabButton, entity(entity, string, entity)) + METHOD(XonoticTabController, configureXonoticTabController, void(entity, float)); + METHOD(XonoticTabController, makeTabButton, entity(entity, string, entity)); ATTRIB(XonoticTabController, rows, float, 0) ATTRIB(XonoticTabController, fontSize, float, SKINFONTSIZE_NORMAL) ATTRIB(XonoticTabController, image, string, SKINGFX_BUTTON) diff --git a/qcsrc/menu/xonotic/textlabel.qc b/qcsrc/menu/xonotic/textlabel.qc index e33182f2d..13d3077ab 100644 --- a/qcsrc/menu/xonotic/textlabel.qc +++ b/qcsrc/menu/xonotic/textlabel.qc @@ -2,8 +2,8 @@ #define TEXTLABEL_H #include "../item/label.qc" CLASS(XonoticTextLabel, Label) - METHOD(XonoticTextLabel, configureXonoticTextLabel, void(entity, float, string)) - METHOD(XonoticTextLabel, draw, void(entity)) + METHOD(XonoticTextLabel, configureXonoticTextLabel, void(entity, float, string)); + METHOD(XonoticTextLabel, draw, void(entity)); ATTRIB(XonoticTextLabel, fontSize, float, SKINFONTSIZE_NORMAL) ATTRIB(XonoticTextLabel, alpha, float, SKINALPHA_TEXT) ATTRIB(XonoticTextLabel, disabledAlpha, float, SKINALPHA_DISABLED) diff --git a/qcsrc/menu/xonotic/textslider.qc b/qcsrc/menu/xonotic/textslider.qc index 47d9eb44d..886465404 100644 --- a/qcsrc/menu/xonotic/textslider.qc +++ b/qcsrc/menu/xonotic/textslider.qc @@ -2,9 +2,9 @@ #define TEXTSLIDER_H #include "../item/textslider.qc" CLASS(XonoticTextSlider, TextSlider) - METHOD(XonoticTextSlider, configureXonoticTextSlider, void(entity, string)) - METHOD(XonoticTextSlider, setValue, void(entity, float)) - METHOD(XonoticTextSlider, configureXonoticTextSliderValues, void(entity)) + METHOD(XonoticTextSlider, configureXonoticTextSlider, void(entity, string)); + METHOD(XonoticTextSlider, setValue, void(entity, float)); + METHOD(XonoticTextSlider, configureXonoticTextSliderValues, void(entity)); ATTRIB(XonoticTextSlider, fontSize, float, SKINFONTSIZE_NORMAL) ATTRIB(XonoticTextSlider, valueSpace, float, SKINWIDTH_SLIDERTEXT) ATTRIB(XonoticTextSlider, image, string, SKINGFX_SLIDER) @@ -17,8 +17,8 @@ CLASS(XonoticTextSlider, TextSlider) ATTRIB(XonoticTextSlider, color2, vector, SKINCOLOR_SLIDER_S) ATTRIB(XonoticTextSlider, cvarName, string, string_null) - METHOD(XonoticTextSlider, loadCvars, void(entity)) - METHOD(XonoticTextSlider, saveCvars, void(entity)) + METHOD(XonoticTextSlider, loadCvars, void(entity)); + METHOD(XonoticTextSlider, saveCvars, void(entity)); ATTRIB(XonoticTextSlider, sendCvars, float, 0) ATTRIB(XonoticTextSlider, alpha, float, SKINALPHA_TEXT) diff --git a/qcsrc/menu/xonotic/weaponarenacheckbox.qc b/qcsrc/menu/xonotic/weaponarenacheckbox.qc index 2a8f3aa03..a0a962de2 100644 --- a/qcsrc/menu/xonotic/weaponarenacheckbox.qc +++ b/qcsrc/menu/xonotic/weaponarenacheckbox.qc @@ -2,14 +2,14 @@ #define WEAPONARENACHECKBOX_H #include "../item/checkbox.qc" CLASS(XonoticWeaponarenaCheckBox, CheckBox) - METHOD(XonoticWeaponarenaCheckBox, configureXonoticWeaponarenaCheckBox, void(entity, string, string)) - METHOD(XonoticWeaponarenaCheckBox, setChecked, void(entity, float)) + METHOD(XonoticWeaponarenaCheckBox, configureXonoticWeaponarenaCheckBox, void(entity, string, string)); + METHOD(XonoticWeaponarenaCheckBox, setChecked, void(entity, float)); ATTRIB(XonoticWeaponarenaCheckBox, fontSize, float, SKINFONTSIZE_NORMAL) ATTRIB(XonoticWeaponarenaCheckBox, image, string, SKINGFX_CHECKBOX) ATTRIB(XonoticWeaponarenaCheckBox, netname, string, string_null) - METHOD(XonoticWeaponarenaCheckBox, loadCvars, void(entity)) - METHOD(XonoticWeaponarenaCheckBox, saveCvars, void(entity)) + METHOD(XonoticWeaponarenaCheckBox, loadCvars, void(entity)); + METHOD(XonoticWeaponarenaCheckBox, saveCvars, void(entity)); ENDCLASS(XonoticWeaponarenaCheckBox) entity makeXonoticWeaponarenaCheckBox(string, string); #endif diff --git a/qcsrc/menu/xonotic/weaponslist.qc b/qcsrc/menu/xonotic/weaponslist.qc index f4bcf4fea..7834153dc 100644 --- a/qcsrc/menu/xonotic/weaponslist.qc +++ b/qcsrc/menu/xonotic/weaponslist.qc @@ -2,16 +2,16 @@ #define WEAPONSLIST_H #include "listbox.qc" CLASS(XonoticWeaponsList, XonoticListBox) - METHOD(XonoticWeaponsList, configureXonoticWeaponsList, void(entity)) - METHOD(XonoticWeaponsList, toString, string(entity)) + METHOD(XonoticWeaponsList, configureXonoticWeaponsList, void(entity)); + METHOD(XonoticWeaponsList, toString, string(entity)); ATTRIB(XonoticWeaponsList, rowsPerItem, float, 1) - METHOD(XonoticWeaponsList, draw, void(entity)) - METHOD(XonoticWeaponsList, drawListBoxItem, void(entity, int, vector, bool, bool)) - METHOD(XonoticWeaponsList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticWeaponsList, keyDown, float(entity, float, float, float)) + METHOD(XonoticWeaponsList, draw, void(entity)); + METHOD(XonoticWeaponsList, drawListBoxItem, void(entity, int, vector, bool, bool)); + METHOD(XonoticWeaponsList, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticWeaponsList, keyDown, float(entity, float, float, float)); ATTRIB(XonoticWeaponsList, realFontSize, vector, '0 0 0') ATTRIB(XonoticWeaponsList, realUpperMargin, float, 0) - METHOD(XonoticWeaponsList, mouseDrag, float(entity, vector)) + METHOD(XonoticWeaponsList, mouseDrag, float(entity, vector)); ENDCLASS(XonoticWeaponsList) entity makeXonoticWeaponsList(); void WeaponsList_MoveUp_Click(entity btn, entity me); -- 2.39.2