Skip to content
Browse files

Merge branch 'bugfixes' into 3.1

  • Loading branch information...
2 parents c55693c + 5b3163b commit 84baba89acb1dc558afcd87e5e55dd033fc7e99b automerge committed with cybersphinx Aug 27, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 src/multimenu.cpp
  2. +1 −1 src/structure.cpp
  3. +1 −1 src/structuredef.h
View
2 src/multimenu.cpp
@@ -669,7 +669,7 @@ static void closeMultiRequester(void)
{
widgDelete(psRScreen,M_REQUEST);
multiRequestUp = false;
-
+ resetReadyStatus(false);
widgReleaseScreen(psRScreen); // move this to the frontend shutdown...
return;
}
View
2 src/structure.cpp
@@ -5457,7 +5457,7 @@ void buildingComplete(STRUCTURE *psBuilding)
prevState = intGetResearchState();
}
- psBuilding->currentBuildPts = (SWORD)psBuilding->pStructureType->buildPoints;
+ psBuilding->currentBuildPts = psBuilding->pStructureType->buildPoints;
psBuilding->status = SS_BUILT;
visTilesUpdate(psBuilding);
View
2 src/structuredef.h
@@ -252,7 +252,7 @@ struct STRUCTURE : public BASE_OBJECT
STRUCTURE_STATS *pStructureType; /* pointer to the structure stats for this type of building */
STRUCT_STATES status; /* defines whether the structure is being built, doing nothing or performing a function */
- SWORD currentBuildPts; /* the build points currently assigned to this structure */
+ int32_t currentBuildPts; /* the build points currently assigned to this structure */
SWORD resistance; /* current resistance points, 0 = cannot be attacked electrically */
UDWORD lastResistance; /* time the resistance was last increased*/
FUNCTIONALITY *pFunctionality; /* pointer to structure that contains fields necessary for functionality */

0 comments on commit 84baba8

Please sign in to comment.
Something went wrong with that request. Please try again.