Merge branch 'master' into go_even_faster

SamuelCho · Jul 22, 2012 · 6c04184 · 6c04184
2 parents c4a6294 + 44702b3
commit 6c04184
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 29 deletions.
diff --git a/code/hud/hudsquadmsg.cpp b/code/hud/hudsquadmsg.cpp
@@ -2592,7 +2592,7 @@ bool HudGaugeSquadMessage::canRender()
 		return false;
 	}
 
-	if (!( Players->flags & PLAYER_FLAGS_MSG_MODE )) {
+	if (!( Player->flags & PLAYER_FLAGS_MSG_MODE )) {
 		return false;
 	}
 

diff --git a/code/menuui/techmenu.cpp b/code/menuui/techmenu.cpp
@@ -526,10 +526,14 @@ void techroom_ships_render(float frametime)
 	light_rotate_all();
 	// lighting for techroom
 
+	Glowpoint_use_depth_buffer = false;
+
 	model_clear_instance(Techroom_ship_modelnum);
 	model_set_detail_level(0);
 	model_render(Techroom_ship_modelnum, -1, &Techroom_ship_orient, &vmd_zero_vector, MR_LOCK_DETAIL | MR_AUTOCENTER);
 
+	Glowpoint_use_depth_buffer = true;
+
 	batch_render_all();
 
 	if (!Cmdline_nohtl)

diff --git a/code/parse/sexp.cpp b/code/parse/sexp.cpp
@@ -6706,11 +6706,11 @@ void sexp_set_object_orientation(int n)
 	sexp_get_object_ship_wing_point_team(&oswpt, CTEXT(n));
 	n = CDR(n);
 
-	a.p = fl_radians(eval_num(n));
+	a.p = fl_radians(eval_num(n) % 360);
 	n = CDR(n);
-	a.b = fl_radians(eval_num(n));
+	a.b = fl_radians(eval_num(n) % 360);
 	n = CDR(n);
-	a.h = fl_radians(eval_num(n));
+	a.h = fl_radians(eval_num(n) % 360);
 	n = CDR(n);
 
 	vm_angles_2_matrix(&target_orient, &a);
@@ -13395,19 +13395,19 @@ void sexp_ship_create(int n)
 
 	n = CDR(n);
 	if(n != -1) {
-		new_ship_ang.p = eval_num(n) * (PI/180.0f);
+		new_ship_ang.p = fl_radians(eval_num(n) % 360);
 		change_angles = true;
 	}
 
 	n = CDR(n);
 	if(n != -1) {
-		new_ship_ang.b = eval_num(n) * (PI/180.0f);
+		new_ship_ang.b = fl_radians(eval_num(n) % 360);
 		change_angles = true;
 	}
 
 	n = CDR(n);
 	if(n != -1) {
-		new_ship_ang.h = eval_num(n) * (PI/180.0f);
+		new_ship_ang.h = fl_radians(eval_num(n) % 360);
 		change_angles = true;
 	}
 
@@ -13460,21 +13460,21 @@ void sexp_weapon_create(int n)
 
 	if (n >= 0)
 	{
-		weapon_angles.p = eval_num(n) * (PI/180.0f);
+		weapon_angles.p = fl_radians(eval_num(n) % 360);
 		n = CDR(n);
 		change_angles = true;
 	}
 
 	if (n >= 0)
 	{
-		weapon_angles.b = eval_num(n) * (PI/180.0f);
+		weapon_angles.b = fl_radians(eval_num(n) % 360);
 		n = CDR(n);
 		change_angles = true;
 	}
 
 	if (n >= 0)
 	{
-		weapon_angles.h = eval_num(n) * (PI/180.0f);
+		weapon_angles.h = fl_radians(eval_num(n) % 360);
 		n = CDR(n);
 		change_angles = true;
 	}
@@ -15439,15 +15439,15 @@ void sexp_set_post_effect(int node)
 void sexp_set_skybox_model(int n)
 {
 	for ( ; n != -1; n = CDR(n)) {
-		if ( !stricmp("default", CTEXT(n)) ) {
-			stars_set_background_model( The_mission.skybox_model, NULL );
-		} else {
-			// stars_level_init() will set the actual mission skybox after this gets
-			// evaluated during parse. by setting it now we get everything loaded so
-			// there is less slowdown when it actually swaps out - taylor
-			stars_set_background_model( CTEXT(n), NULL );
-		}
+	if ( !stricmp("default", CTEXT(n)) ) {
+		stars_set_background_model( The_mission.skybox_model, NULL );
+	} else {
+		// stars_level_init() will set the actual mission skybox after this gets
+		// evaluated during parse. by setting it now we get everything loaded so
+		// there is less slowdown when it actually swaps out - taylor
+		stars_set_background_model( CTEXT(n), NULL );
 	}
+			}
 }
 
 // taylor - preload a skybox model.  this doesn't set anything as viewable, just loads it into memory
@@ -19036,11 +19036,11 @@ void sexp_set_camera_rotation(int n)
 	float rot_dec_time = 0.0f;
 
 	//Angles are in degrees
-	rot_angles.p = eval_num(n) * (PI/180.0f);
+	rot_angles.p = fl_radians(eval_num(n) % 360);
 	n = CDR(n);
-	rot_angles.b = eval_num(n) * (PI/180.0f);
+	rot_angles.b = fl_radians(eval_num(n) % 360);
 	n = CDR(n);
-	rot_angles.h = eval_num(n) * (PI/180.0f);
+	rot_angles.h = fl_radians(eval_num(n) % 360);
 	n = CDR(n);
 	if(n != -1)
 	{
@@ -19249,7 +19249,7 @@ void sexp_set_camera_fov(int n)
 	float camera_acc_time = 0.0f;
 	float camera_dec_time = 0.0f;
 
-	float camera_fov = i2fl(eval_num(n)) * (PI/180.0f);
+	float camera_fov = fl_radians(eval_num(n) % 360);
 	n = CDR(n);
 
 	if(n != -1)
@@ -19415,10 +19415,8 @@ void sexp_set_fov(int n)
 	}
 
 	//Cap FOV to something reasonable.
-	float new_fov = (float)eval_num(n);
-	CLAMP(new_fov, 0.0f, 360.0f);
-
-	Sexp_fov = (new_fov * (PI/180.0f));
+	float new_fov = (float)(eval_num(n) % 360);
+	Sexp_fov = fl_radians(new_fov);
 
 	multi_start_callback();
 	multi_send_float(new_fov);
@@ -19436,7 +19434,7 @@ void multi_sexp_set_fov()
 	}
 
 	multi_get_float(new_fov);
-	Sexp_fov = (new_fov * (PI/180.0f));
+	Sexp_fov = fl_radians(new_fov);
 }
 
 int sexp_get_fov()
@@ -19446,9 +19444,9 @@ int sexp_get_fov()
 		return -1;
 	else if(Sexp_fov > 0.0f)
 		// SEXP override has been set
-		return (int) (Sexp_fov / (PI/180.0f));
+		return (int) fl_degrees(Sexp_fov);
 	else	
-		return (int) (cam->get_fov() / (PI/180.0f));
+		return (int) fl_degrees(cam->get_fov());
 }
 
 /**