Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
danij-deng committed Dec 29, 2011
1 parent 35a5515 commit bd64179
Show file tree
Hide file tree
Showing 5 changed files with 194 additions and 423 deletions.
10 changes: 1 addition & 9 deletions doomsday/plugins/common/include/hu_lib.h
Expand Up @@ -270,11 +270,6 @@ typedef enum {

#define VALID_MNPAGE_FONTID(v) ((v) >= MENU_FONT1 && (v) < MENU_FONT_COUNT)

/*typedef struct mn_page_unscaledstate_s {
uint numVisObjects;
int y;
} mn_page_unscaledstate_t;*/

typedef struct mn_page_s {
mn_object_t* objects; // List of objects.
Point2Raw origin;
Expand All @@ -284,10 +279,7 @@ typedef struct mn_page_s {
int (*cmdResponder) (struct mn_page_s* page, menucommand_e cmd);
struct mn_page_s* previous; // Pointer to the previous page, if any.
void* data;
// For scrollable multi-pages.
//uint firstObject, numVisObjects;
// Scalable pages.
//mn_page_unscaledstate_t unscaled;

// Auto-initialized.
int objectsCount;
int focus; // Index of the focus object.
Expand Down
7 changes: 7 additions & 0 deletions doomsday/plugins/common/include/hu_menu.h
Expand Up @@ -103,8 +103,11 @@ extern mn_page_t InventoryMenu;
#endif
extern mn_page_t WeaponMenu;

extern int menuTime;

extern boolean menuNominatingQuickSaveSlot;

/// Register the console commands, variables, etc..., of this module.
void Hu_MenuRegister(void);

/**
Expand Down Expand Up @@ -138,6 +141,10 @@ void Hu_MenuDrawer(void);

void Hu_MenuDrawFocusCursor(int x, int y, int focusObjectHeight, float alpha);

void Hu_MenuDrawPageTitle(const char* title, int x, int y);

void Hu_MenuDrawPageNavigation(mn_page_t* page, int x, int y);

/// @return @c true if the input event @a ev was eaten.
int Hu_MenuPrivilegedResponder(event_t* ev);

Expand Down

0 comments on commit bd64179

Please sign in to comment.