Changeset 105


Ignore:
Timestamp:
Mar 14, 2008, 11:00:51 PM (10 years ago)
Author:
Sam Hocevar
Message:
  • Rename arrays to avoid having a variable called "wm".

Inspired by Win32 Abuse changelog for January 28, 2001:

  • renamed wm[] array in dev.cpp to WinMenus? so that it

doesn't have a name collision with the satic wm
singleton.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/dev.cpp

    r67 r105  
    34633463
    34643464
    3465 static pmi fm[]={
     3465static pmi filemenu[]={
    34663466          {"menu1_load",         ID_LEVEL_LOAD,NULL,-1},
    34673467          {NULL,0,NULL,-1},
     
    34843484
    34853485
    3486 static pmi em[]={
     3486static pmi editmenu[]={
    34873487  {"menu2_light",               ID_TOGGLE_LIGHT,NULL,-1},
    34883488  {"menu2_scroll",            ID_SET_SCROLL,NULL,-1},
     
    35143514
    35153515// Window Menus
    3516 static pmi wm[]={
     3516static pmi winmenu[]={
    35173517          {"menu3_fore",    ID_WIN_FORE,    &forew_on,-1},
    35183518          {"menu3_back",    ID_WIN_BACK,    &backw_on,-1},
     
    35323532
    35333533/*
    3534 static pmi fm[]={
     3534static pmi filemenu[]={
    35353535          {"Load Level",         ID_LEVEL_LOAD,NULL,-1},
    35363536          {NULL,0,NULL,-1},
     
    35533553
    35543554
    3555 static pmi em[]={
     3555static pmi editmenu[]={
    35563556  {"Toggle light",               ID_TOGGLE_LIGHT,NULL,-1},
    35573557  {"Set scroll rate",            ID_SET_SCROLL,NULL,-1},
     
    35833583
    35843584// Window Menus
    3585 static pmi wm[]={
     3585static pmi winmenu[]={
    35863586          {"Foreground  (f)",    ID_WIN_FORE,    &forew_on,-1},
    35873587          {"Background  (b)",    ID_WIN_BACK,    &backw_on,-1},
     
    36113611{
    36123612  return new pmenu(x,y,
    3613          new pmenu_item(symbol_str("file_top"),new psub_menu(i_recurse(fm),NULL),
    3614          new pmenu_item(symbol_str("edit_top"),new psub_menu(i_recurse(em),NULL),
    3615          new pmenu_item(symbol_str("window_top"),new psub_menu(i_recurse(wm),NULL),NULL))),screen,eh);
     3613         new pmenu_item(symbol_str("file_top"),new psub_menu(i_recurse(filemenu),NULL),
     3614         new pmenu_item(symbol_str("edit_top"),new psub_menu(i_recurse(editmenu),NULL),
     3615         new pmenu_item(symbol_str("window_top"),new psub_menu(i_recurse(winmenu),NULL),NULL))),screen,eh);
    36163616}
    36173617
Note: See TracChangeset for help on using the changeset viewer.