Qt c++ function name shadow warnings
We have a struct called mkroom and a function called mkroom() so c++ complains about the mkroom() function hiding the initializer for the struct. Similarly, we have a struct called attack and a function called attack(). There may be a more elegant way of eliminating those two warnings, but renaming mkroom() to do_mkroom() and attack() to do_attack() was straightforward enough.
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
|
||||
/*
|
||||
* Entry points:
|
||||
* mkroom() -- make and stock a room of a given type
|
||||
* do_mkroom() -- make and stock a room of a given type
|
||||
* nexttodoor() -- return TRUE if adjacent to a door
|
||||
* has_dnstairs() -- return TRUE if given room has a down staircase
|
||||
* has_upstairs() -- return TRUE if given room has an up staircase
|
||||
@@ -43,7 +43,7 @@ isbig(struct mkroom* sroom)
|
||||
|
||||
/* make and stock a room of a given type */
|
||||
void
|
||||
mkroom(int roomtype)
|
||||
do_mkroom(int roomtype)
|
||||
{
|
||||
if (roomtype >= SHOPBASE)
|
||||
mkshop(); /* someday, we should be able to specify shop type */
|
||||
|
||||
Reference in New Issue
Block a user