sc2-cvs

[Sc2-cvs] SF.net SVN: sc2:[3547] trunk/sc2/src/uqm/hyper.c

[<av...@us...>]

Revision: 3547
          http://sc2.svn.sourceforge.net/sc2/?rev=3547&view=rev
Author:   avolkov
Date:     2010-06-02 21:11:00 +0000 (Wed, 02 Jun 2010)

Log Message:
-----------
Fix a crash when saving a game from Hyperspace encounter screen

Modified Paths:
--------------
    trunk/sc2/src/uqm/hyper.c

Modified: trunk/sc2/src/uqm/hyper.c
===================================================================
--- trunk/sc2/src/uqm/hyper.c	2010-06-02 20:59:33 UTC (rev 3546)
+++ trunk/sc2/src/uqm/hyper.c	2010-06-02 21:11:00 UTC (rev 3547)
@@ -1740,6 +1740,10 @@
 
 	// Update 'GLOBAL (ShipFacing)' to the direction the flagship is facing
 	hSisElement = getSisElement ();
+	if (!hSisElement)
+	{	// Happens when saving a game from Hyperspace encounter screen
+		return;
+	}
 	//if (ElementPtr->state_flags & PLAYER_SHIP)
 	LockElement (hSisElement, &ElementPtr);
 	GetElementStarShip (ElementPtr, &StarShipPtr);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sc2-cvs] SF.net SVN: sc2:[3669] trunk/sc2/src/uqm/hyper.c

[<av...@us...>]

Revision: 3669
          http://sc2.svn.sourceforge.net/sc2/?rev=3669&view=rev
Author:   avolkov
Date:     2011-08-25 21:34:10 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
Cleanup: AllocHyperElement() only needs a POINT arg (in preparation for ENCOUNTER cleanup)

Modified Paths:
--------------
    trunk/sc2/src/uqm/hyper.c

Modified: trunk/sc2/src/uqm/hyper.c
===================================================================
--- trunk/sc2/src/uqm/hyper.c	2011-08-24 16:51:09 UTC (rev 3668)
+++ trunk/sc2/src/uqm/hyper.c	2011-08-25 21:34:10 UTC (rev 3669)
@@ -758,7 +758,7 @@
 }
 
 static HELEMENT
-AllocHyperElement (STAR_DESC *SDPtr)
+AllocHyperElement (const POINT *elem_pt)
 {
 	HELEMENT hHyperSpaceElement;
 
@@ -776,11 +776,11 @@
 		{
 			long lx, ly;
 
-			lx = UNIVERSE_TO_LOGX (SDPtr->star_pt.x)
+			lx = UNIVERSE_TO_LOGX (elem_pt->x)
 					+ (LOG_SPACE_WIDTH >> 1) - GLOBAL_SIS (log_x);
 			HyperSpaceElementPtr->current.location.x = WRAP_X (lx);
 
-			ly = UNIVERSE_TO_LOGY (SDPtr->star_pt.y)
+			ly = UNIVERSE_TO_LOGY (elem_pt->y)
 					+ (LOG_SPACE_HEIGHT >> 1) - GLOBAL_SIS (log_y);
 			HyperSpaceElementPtr->current.location.y = WRAP_Y (ly);
 		}
@@ -951,7 +951,7 @@
 {
 	BOOLEAN NewEncounter;
 	HELEMENT hElement;
-	STAR_DESC SD;
+	POINT enc_pt;
 	
 	if (GET_GAME_STATE (ARILOU_SPACE_SIDE) >= 2)
 		return 0;
@@ -969,7 +969,7 @@
 	if (LONIBBLE (EncounterPtr->SD.Index))
 	{
 		NewEncounter = FALSE;
-		SD.star_pt = EncounterPtr->SD.star_pt;
+		enc_pt = EncounterPtr->SD.star_pt;
 	}
 	else
 	{
@@ -1021,29 +1021,29 @@
 
 			rand_val = TFB_Random ();
 
-			SD.star_pt.x = puniverse->x
+			enc_pt.x = puniverse->x
 					+ (LOWORD (rand_val) % (XOFFS << 1)) - XOFFS;
-			if (SD.star_pt.x < 0)
-				SD.star_pt.x = 0;
-			else if (SD.star_pt.x > MAX_X_UNIVERSE)
-				SD.star_pt.x = MAX_X_UNIVERSE;
-			SD.star_pt.y = puniverse->y
+			if (enc_pt.x < 0)
+				enc_pt.x = 0;
+			else if (enc_pt.x > MAX_X_UNIVERSE)
+				enc_pt.x = MAX_X_UNIVERSE;
+			enc_pt.y = puniverse->y
 					+ (HIWORD (rand_val) % (YOFFS << 1)) - YOFFS;
-			if (SD.star_pt.y < 0)
-				SD.star_pt.y = 0;
-			else if (SD.star_pt.y > MAX_Y_UNIVERSE)
-				SD.star_pt.y = MAX_Y_UNIVERSE;
+			if (enc_pt.y < 0)
+				enc_pt.y = 0;
+			else if (enc_pt.y > MAX_Y_UNIVERSE)
+				enc_pt.y = MAX_Y_UNIVERSE;
 
-			dx = SD.star_pt.x - EncounterPtr->origin.x;
-			dy = SD.star_pt.y - EncounterPtr->origin.y;
+			dx = enc_pt.x - EncounterPtr->origin.x;
+			dy = enc_pt.y - EncounterPtr->origin.y;
 		} while ((DWORD)((long)dx * dx + (long)dy * dy) > radius_squared);
 
-		EncounterPtr->SD.star_pt = SD.star_pt;
-		EncounterPtr->log_x = UNIVERSE_TO_LOGX (SD.star_pt.x);
-		EncounterPtr->log_y = UNIVERSE_TO_LOGY (SD.star_pt.y);
+		EncounterPtr->SD.star_pt = enc_pt;
+		EncounterPtr->log_x = UNIVERSE_TO_LOGX (enc_pt.x);
+		EncounterPtr->log_y = UNIVERSE_TO_LOGY (enc_pt.y);
 	}
 
-	hElement = AllocHyperElement (&SD);
+	hElement = AllocHyperElement (&enc_pt);
 	if (hElement)
 	{
 		SIZE i;
@@ -1482,7 +1482,7 @@
 					|| ey > (YOFFS / NUM_RADAR_SCREENS))
 				continue;
 
-			hHyperSpaceElement = AllocHyperElement (&SD[i]);
+			hHyperSpaceElement = AllocHyperElement (&SD[i].star_pt);
 			if (hHyperSpaceElement == 0)
 				continue;
 
@@ -1527,7 +1527,7 @@
 					|| ey > (YOFFS / NUM_RADAR_SCREENS))
 				continue;
 
-			hHyperSpaceElement = AllocHyperElement (SDPtr);
+			hHyperSpaceElement = AllocHyperElement (&SDPtr->star_pt);
 			if (hHyperSpaceElement == 0)
 				continue;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.