Merge branch 'bugfixes' into 3.1

Warzone2100 · Aug 27, 2012 · 84baba8 · 84baba8
2 parents c55693c + 5b3163b
commit 84baba8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/multimenu.cpp b/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;
 }

diff --git a/src/structure.cpp b/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);

diff --git a/src/structuredef.h b/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 */