patches/obby-01-cast.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 218 39b7a0a2d4b2
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
218
39b7a0a2d4b2 2007-04-02 Damien Carbery <[email protected]>
daymobrew
parents: 1
diff changeset
     1
--- obby-0.4.0rc2/src/colour.cpp.orig	2007-04-02 10:24:23.693956591 +0100
39b7a0a2d4b2 2007-04-02 Damien Carbery <[email protected]>
daymobrew
parents: 1
diff changeset
     2
+++ obby-0.4.0rc2/src/colour.cpp	2007-04-02 10:26:48.158738719 +0100
1
60fdac847787 initial import
laca_
parents:
diff changeset
     3
@@ -46,9 +46,9 @@
60fdac847787 initial import
laca_
parents:
diff changeset
     4
 bool obby::colour::similar_colour(const colour& colour) const
60fdac847787 initial import
laca_
parents:
diff changeset
     5
 {
60fdac847787 initial import
laca_
parents:
diff changeset
     6
 	// TODO: Convert to HSV for better checking
60fdac847787 initial import
laca_
parents:
diff changeset
     7
-	return abs(m_red - colour.m_red) +
60fdac847787 initial import
laca_
parents:
diff changeset
     8
-	       abs(m_green - colour.m_green) +
60fdac847787 initial import
laca_
parents:
diff changeset
     9
-	       abs(m_blue - colour.m_blue) < 32;
60fdac847787 initial import
laca_
parents:
diff changeset
    10
+	return abs((long)(m_red - colour.m_red)) +
60fdac847787 initial import
laca_
parents:
diff changeset
    11
+	       abs((long)(m_green - colour.m_green)) +
60fdac847787 initial import
laca_
parents:
diff changeset
    12
+	       abs((long)(m_blue - colour.m_blue)) < 32;
60fdac847787 initial import
laca_
parents:
diff changeset
    13
 }
60fdac847787 initial import
laca_
parents:
diff changeset
    14
 
218
39b7a0a2d4b2 2007-04-02 Damien Carbery <[email protected]>
daymobrew
parents: 1
diff changeset
    15
 std::string serialise::default_context_to<obby::colour>::