← Back to branch summary

~ubuntu-branches/ubuntu/maverick/lordsawar/maverick

« back to all changes in this revision

Viewing changes to src/SmallTile.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Barry deFreese
  • Date: 2010-04-10 09:29:33 UTC
  • mfrom: (1.1.9 upstream) (5.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100410092933-23uq4dxig30kmtcw
Tags: 0.1.8-1
* New upstream release.
* Add misc:Depends for -data package.
* Bump Standards Version to 3.8.4. (No changes needed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/SmallTile.cpp
32
32
 
33
33
SmallTile::SmallTile(XML_Helper* helper)
34
34
{
35
 
  guint32 r, g, b;
36
 
  helper->getData(r, "red");
37
 
  helper->getData(g, "green");
38
 
  helper->getData(b, "blue");
39
 
  d_color.set_rgb_p((float)r/255.0,(float)g/255.0, (float)b/255.0);
 
35
  helper->getData(d_color, "color");
40
36
 
41
37
  guint32 i;
42
38
  helper->getData(i, "pattern");
45
41
 
46
42
  if (pattern != SOLID)
47
43
    {
48
 
      helper->getData(r, "2nd_red");
49
 
      helper->getData(g, "2nd_green");
50
 
      helper->getData(b, "2nd_blue");
51
 
      d_second_color.set_rgb_p((float)r/255.0,(float)g/255.0, (float)b/255.0);
 
44
      helper->getData(d_second_color, "2nd_color");
52
45
      if (pattern != STIPPLED && pattern != SUNKEN)
53
 
        {
54
 
          helper->getData(r, "3rd_red");
55
 
          helper->getData(g, "3rd_green");
56
 
          helper->getData(b, "3rd_blue");
57
 
          d_third_color.set_rgb_p((float)r/255.0,(float)g/255.0, 
58
 
                                  (float)b/255.0);
59
 
        }
 
46
        helper->getData(d_third_color, "3rd_color");
60
47
    }
61
48
}
62
49
 
63
 
bool SmallTile::save(XML_Helper *helper)
 
50
bool SmallTile::save(XML_Helper *helper) const
64
51
{
65
52
  bool retval = true;
66
53
 
70
57
    {
71
58
      //patterns with a single colour
72
59
    case SOLID:
73
 
      retval &= helper->saveData("red", int(d_color.get_red_p() *255));
74
 
      retval &= helper->saveData("green", int(d_color.get_green_p()*255));
75
 
      retval &= helper->saveData("blue", int(d_color.get_blue_p()*255));
 
60
      retval &= helper->saveData("color", d_color);
76
61
      break;
77
62
      //patterns with two colours
78
63
    case STIPPLED: case SUNKEN:
79
 
      retval &= helper->saveData("red", int(d_color.get_red_p() *255));
80
 
      retval &= helper->saveData("green", int(d_color.get_green_p()*255));
81
 
      retval &= helper->saveData("blue", int(d_color.get_blue_p()*255));
82
 
      retval &= helper->saveData("2nd_red", 
83
 
                                 int(d_second_color.get_red_p() *255));
84
 
      retval &= helper->saveData("2nd_green", 
85
 
                                 int(d_second_color.get_green_p()*255));
86
 
      retval &= helper->saveData("2nd_blue", 
87
 
                                 int(d_second_color.get_blue_p()*255));
 
64
      retval &= helper->saveData("color", d_color);
 
65
      retval &= helper->saveData("2nd_color", d_second_color);
88
66
      break;
89
67
      //patterns with three colours
90
68
    case RANDOMIZED: case TABLECLOTH: case DIAGONAL: case CROSSHATCH:
91
69
    case SUNKEN_STRIPED:
92
 
      retval &= helper->saveData("red", int(d_color.get_red_p() *255));
93
 
      retval &= helper->saveData("green", int(d_color.get_green_p()*255));
94
 
      retval &= helper->saveData("blue", int(d_color.get_blue_p()*255));
95
 
      retval &= helper->saveData("2nd_red", 
96
 
                                 int(d_second_color.get_red_p() *255));
97
 
      retval &= helper->saveData("2nd_green", 
98
 
                                 int(d_second_color.get_green_p()*255));
99
 
      retval &= helper->saveData("2nd_blue", 
100
 
                                 int(d_second_color.get_blue_p()*255));
101
 
      retval &= helper->saveData("3rd_red", 
102
 
                                 int(d_third_color.get_red_p() *255));
103
 
      retval &= helper->saveData("3rd_green", 
104
 
                                 int(d_third_color.get_green_p()*255));
105
 
      retval &= helper->saveData("3rd_blue", 
106
 
                                 int(d_third_color.get_blue_p()*255));
 
70
      retval &= helper->saveData("color", d_color);
 
71
      retval &= helper->saveData("2nd_color", d_second_color);
 
72
      retval &= helper->saveData("3rd_color", d_third_color);
107
73
      break;
108
74
    }
109
75
  retval &= helper->closeTag();