From 2f5efeaf6a7347a7b74acad1f491dc7fe7d29d55 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Tue, 7 Aug 2001 16:29:18 +0000
Subject: [PATCH] squelch compiler warnings

---
 panda/src/gobj/material.cxx                   |  5 ---
 .../particlesystem/pointParticleRenderer.cxx  | 31 ++++++++++---------
 panda/src/pnmimage/pnmimage_composite2.cxx    |  2 +-
 panda/src/putil/bamWriter.cxx                 |  6 ++--
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/panda/src/gobj/material.cxx b/panda/src/gobj/material.cxx
index 877adcfb62..da986f9a8d 100644
--- a/panda/src/gobj/material.cxx
+++ b/panda/src/gobj/material.cxx
@@ -189,22 +189,17 @@ output(ostream &out) const {
 ////////////////////////////////////////////////////////////////////
 void Material::
 write(ostream &out, int indent_level) const {
-  bool any = false;
   if (has_ambient()) {
     indent(out, indent_level) << "ambient = " << get_ambient() << "\n";
-    any = true;
   }
   if (has_diffuse()) {
     indent(out, indent_level) << "diffuse = " << get_diffuse() << "\n";
-    any = true;
   }
   if (has_specular()) {
     indent(out, indent_level) << "specular = " << get_specular() << "\n";
-    any = true;
   }
   if (has_emission()) {
     indent(out, indent_level) << "emission = " << get_emission() << "\n";
-    any = true;
   }
   indent(out, indent_level) << "shininess = " << get_shininess() << "\n";
   indent(out, indent_level) << "local = " << get_local() << "\n";
diff --git a/panda/src/particlesystem/pointParticleRenderer.cxx b/panda/src/particlesystem/pointParticleRenderer.cxx
index 53a7e045c8..c51e77aae8 100644
--- a/panda/src/particlesystem/pointParticleRenderer.cxx
+++ b/panda/src/particlesystem/pointParticleRenderer.cxx
@@ -148,7 +148,8 @@ kill_particle(int) {
 Colorf PointParticleRenderer::
 create_color(const BaseParticle *p) {
   Colorf color;
-  float life_t, vel_t, parameterized_age;
+  float life_t, vel_t;
+  float parameterized_age = 1.0f;
   bool have_alpha_t = false;
 
   switch (_blend_type) {
@@ -163,16 +164,16 @@ create_color(const BaseParticle *p) {
 
   case PP_BLEND_LIFE:
     parameterized_age = p->get_parameterized_age();
-        life_t = parameterized_age;
+    life_t = parameterized_age;
     have_alpha_t = true;
 
     if (_blend_method == PP_BLEND_CUBIC)
       life_t = CUBIC_T(life_t);
-
+    
     color = LERP(life_t, _start_color, _end_color);
-
+    
     break;
-
+    
     //// Blending colors based on vel
 
   case PP_BLEND_VEL:
@@ -189,17 +190,17 @@ create_color(const BaseParticle *p) {
   // handle alpha channel
 
   if(_alpha_mode != PR_ALPHA_NONE) {
-        if(_alpha_mode == PR_ALPHA_USER) {
-                parameterized_age = get_user_alpha();
-        } else {
-                if(!have_alpha_t)
-                          parameterized_age = p->get_parameterized_age();
+    if(_alpha_mode == PR_ALPHA_USER) {
+      parameterized_age = get_user_alpha();
+    } else {
+      if(!have_alpha_t)
+        parameterized_age = p->get_parameterized_age();
 
-                if(_alpha_mode==PR_ALPHA_OUT) {
-                        parameterized_age=1.0f-parameterized_age;
-                }
-        }
-        color[3] = parameterized_age;
+      if(_alpha_mode==PR_ALPHA_OUT) {
+        parameterized_age=1.0f-parameterized_age;
+      }
+    }
+    color[3] = parameterized_age;
   }
 
   return color;
diff --git a/panda/src/pnmimage/pnmimage_composite2.cxx b/panda/src/pnmimage/pnmimage_composite2.cxx
index c4c28b4237..fdedd339ee 100644
--- a/panda/src/pnmimage/pnmimage_composite2.cxx
+++ b/panda/src/pnmimage/pnmimage_composite2.cxx
@@ -3,4 +3,4 @@
 #include "pnmImageHeader.cxx"
 #include "pnmReader.cxx"
 #include "pnmWriter.cxx"
-#include "pnmFileTypeRegistry.cxx"
\ No newline at end of file
+#include "pnmFileTypeRegistry.cxx"
diff --git a/panda/src/putil/bamWriter.cxx b/panda/src/putil/bamWriter.cxx
index 2db9f11e1b..dfad48bd86 100644
--- a/panda/src/putil/bamWriter.cxx
+++ b/panda/src/putil/bamWriter.cxx
@@ -326,14 +326,14 @@ enqueue_object(TypedWritable *object) {
   // We need to assign a unique index number to every object we write
   // out.  Has this object been assigned a number yet?
   int object_id;
-  bool already_written;
+  //  bool already_written;
 
   StateMap::iterator si = _state_map.find(object);
   if (si == _state_map.end()) {
     // No, it hasn't, so assign it the next number in sequence
     // arbitrarily.
     object_id = _next_object_id;
-    already_written = false;
+    //    already_written = false;
 
     // Make sure our object ID will fit within the PN_uint16 we have
     // allocated for it.
@@ -347,7 +347,7 @@ enqueue_object(TypedWritable *object) {
   } else {
     // Yes, it has; get the object ID.
     object_id = (*si).second._object_id;
-    already_written = (*si).second._written;
+    //    already_written = (*si).second._written;
   }
 
   _object_queue.push_back(object);