Sun, 14 Dec 2014 23:38:26 +0200
- cleanup, refactor + better input handling
9
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
1 | /* |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
2 | Copyright 2014 Teemu Piippo |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
3 | All rights reserved. |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
4 | |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
5 | Redistribution and use in source and binary forms, with or without |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
6 | modification, are permitted provided that the following conditions |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
7 | are met: |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
8 | |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
9 | 1. Redistributions of source code must retain the above copyright |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
10 | notice, this list of conditions and the following disclaimer. |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
11 | 2. Redistributions in binary form must reproduce the above copyright |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
12 | notice, this list of conditions and the following disclaimer in the |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
13 | documentation and/or other materials provided with the distribution. |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
14 | 3. Neither the name of the copyright holder nor the names of its |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
15 | contributors may be used to endorse or promote products derived from |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
16 | this software without specific prior written permission. |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
17 | |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
19 | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
20 | TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
21 | PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
22 | OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
23 | EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
24 | PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
25 | PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
26 | LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
27 | NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
28 | SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
29 | */ |
e7a09ceb4505
- now with more license headers
Teemu Piippo <crimsondusk64@gmail.com>
parents:
5
diff
changeset
|
30 | |
5 | 31 | #include "bytestream.h" |
32 | #include <string.h> | |
33 | ||
34 | // ------------------------------------------------------------------------------------------------- | |
35 | // | |
36 | Bytestream::Bytestream (unsigned long length) : | |
37 | m_data (nullptr) | |
38 | { | |
39 | resize (length); | |
40 | clear(); | |
41 | } | |
42 | ||
43 | // ------------------------------------------------------------------------------------------------- | |
44 | // | |
45 | Bytestream::Bytestream (const unsigned char* data, unsigned long length) : | |
46 | m_data (nullptr) | |
47 | { | |
48 | init (data, length); | |
49 | } | |
50 | ||
51 | // ------------------------------------------------------------------------------------------------- | |
52 | // | |
53 | Bytestream::Bytestream (const Vector<unsigned char>& bytes) : | |
54 | m_data (nullptr) | |
55 | { | |
56 | init (bytes.data(), bytes.size()); | |
57 | } | |
58 | ||
59 | // ------------------------------------------------------------------------------------------------- | |
60 | // | |
11 | 61 | Bytestream::Bytestream (const Bytestream& other) : |
62 | m_data (nullptr) | |
63 | { | |
64 | init (other.data(), other.written_length()); | |
65 | } | |
66 | ||
67 | // ------------------------------------------------------------------------------------------------- | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
68 | // |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
69 | Bytestream::~Bytestream() |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
70 | { |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
71 | delete m_data; |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
72 | } |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
73 | |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
74 | // ------------------------------------------------------------------------------------------------- |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
75 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
76 | Bytestream::operator= (const Bytestream& other) -> Bytestream& |
11 | 77 | { |
78 | init (other.data(), other.written_length()); | |
79 | return *this; | |
80 | } | |
81 | ||
82 | // ------------------------------------------------------------------------------------------------- | |
83 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
84 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
85 | Bytestream::resize (unsigned long newsize) -> void |
5 | 86 | { |
87 | Vector<unsigned char> olddata; | |
88 | unsigned long oldsize = 0L; | |
89 | ||
90 | if (m_data != nullptr) | |
91 | { | |
92 | oldsize = allocated_size(); | |
93 | olddata.resize (oldsize); | |
94 | memcpy (olddata.data(), m_data, oldsize); | |
95 | } | |
96 | ||
97 | delete[] m_data; | |
98 | m_allocatedSize = newsize; | |
99 | m_data = new unsigned char[newsize]; | |
100 | ||
101 | if (olddata > 0L) | |
102 | memcpy (m_data, olddata, min (oldsize, newsize)); | |
103 | } | |
104 | ||
105 | // ------------------------------------------------------------------------------------------------- | |
106 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
107 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
108 | Bytestream::init (const unsigned char* data, unsigned long length) -> void |
5 | 109 | { |
110 | resize (length); | |
111 | memcpy (m_data, data, length); | |
112 | m_cursor = &m_data[0]; | |
113 | m_writtenLength = length; | |
114 | } | |
115 | ||
116 | // ------------------------------------------------------------------------------------------------- | |
117 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
118 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
119 | Bytestream::clear() -> void |
5 | 120 | { |
121 | m_cursor = &m_data[0]; | |
122 | m_writtenLength = 0; | |
123 | } | |
124 | ||
125 | // ------------------------------------------------------------------------------------------------- | |
126 | // | |
13
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
127 | METHOD |
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
128 | Bytestream::ensure_read_space (unsigned int bytes) -> void |
5 | 129 | { |
13
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
130 | if (bytes_left() < bytes) |
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
131 | { |
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
132 | throw IOError (format ("attempted to read %1 byte(s) past the end of bytestream", |
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
133 | bytes - bytes_left())); |
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
134 | } |
5 | 135 | } |
136 | ||
137 | // ------------------------------------------------------------------------------------------------- | |
138 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
139 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
140 | Bytestream::read_byte() -> char |
5 | 141 | { |
13
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
142 | ensure_read_space (1); |
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
143 | return *m_cursor++; |
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
144 | } |
5 | 145 | |
13
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
146 | // ------------------------------------------------------------------------------------------------- |
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
147 | // |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
148 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
149 | Bytestream::read_short() -> short int |
13
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
150 | { |
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
151 | ensure_read_space (2); |
10
3874575d924d
- begin work on rcon sessions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
9
diff
changeset
|
152 | short int result = 0; |
5 | 153 | |
154 | for (int i = 0; i < 2; ++i) | |
10
3874575d924d
- begin work on rcon sessions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
9
diff
changeset
|
155 | result |= m_cursor[i] << (i * 8); |
5 | 156 | |
10
3874575d924d
- begin work on rcon sessions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
9
diff
changeset
|
157 | m_cursor += 2; |
3874575d924d
- begin work on rcon sessions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
9
diff
changeset
|
158 | return result; |
5 | 159 | } |
160 | ||
161 | // ------------------------------------------------------------------------------------------------- | |
162 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
163 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
164 | Bytestream::read_long() -> long int |
5 | 165 | { |
13
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
166 | ensure_read_space (4); |
10
3874575d924d
- begin work on rcon sessions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
9
diff
changeset
|
167 | long int result = 0; |
5 | 168 | |
169 | for (int i = 0; i < 4; ++i) | |
10
3874575d924d
- begin work on rcon sessions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
9
diff
changeset
|
170 | result |= m_cursor[i] << (i * 8); |
5 | 171 | |
10
3874575d924d
- begin work on rcon sessions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
9
diff
changeset
|
172 | m_cursor += 4; |
3874575d924d
- begin work on rcon sessions
Teemu Piippo <crimsondusk64@gmail.com>
parents:
9
diff
changeset
|
173 | return result; |
5 | 174 | } |
175 | ||
176 | // ------------------------------------------------------------------------------------------------- | |
177 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
178 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
179 | Bytestream::read_float() -> float |
5 | 180 | { |
13
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
181 | int value = read_long(); |
5 | 182 | return reinterpret_cast<float&> (value); |
183 | } | |
184 | ||
185 | // ------------------------------------------------------------------------------------------------- | |
186 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
187 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
188 | Bytestream::read_string() -> String |
5 | 189 | { |
190 | // Zandronum sends strings of maximum 2048 characters, though it only | |
191 | // reads 2047-character long ones so I guess we can follow up and do | |
192 | // the same :-) | |
193 | static char buffer[MAX_NETWORK_STRING]; | |
194 | unsigned char* stringEnd; | |
195 | unsigned char* stringBegin = m_cursor; | |
196 | unsigned char* end = m_data + allocated_size(); | |
197 | ||
198 | // where's the end of the string? | |
199 | for (stringEnd = m_cursor; *stringEnd != '\0'; ++stringEnd) | |
200 | { | |
201 | if (stringEnd == end) | |
202 | // past the end of the buffer! Argh! | |
13
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
203 | throw IOError ("unterminated string in packet"); |
5 | 204 | } |
205 | ||
206 | m_cursor = stringEnd + 1; | |
207 | unsigned int length = stringEnd - m_cursor; | |
208 | ||
209 | // ensure we won't write past the buffer (note: we still moved | |
210 | // past the excess bytes in the above statement, those are ignored) | |
211 | if (length >= MAX_NETWORK_STRING) | |
212 | length = MAX_NETWORK_STRING - 1; | |
213 | ||
214 | memcpy (buffer, stringBegin, length); | |
215 | buffer[length] = '\0'; | |
216 | return String (buffer); | |
217 | } | |
218 | ||
219 | // ------------------------------------------------------------------------------------------------- | |
220 | // | |
221 | METHOD | |
13
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
222 | Bytestream::read (unsigned char* buffer, unsigned long length) -> void |
5 | 223 | { |
13
09dcaeaa216b
- to hell with that 'ok' field. now throws an exception if attempts to read past the end
Teemu Piippo <crimsondusk64@gmail.com>
parents:
11
diff
changeset
|
224 | ensure_read_space (length); |
5 | 225 | memcpy (buffer, m_cursor, length); |
226 | m_cursor += length; | |
227 | } | |
228 | ||
229 | // ------------------------------------------------------------------------------------------------- | |
230 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
231 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
232 | Bytestream::write (unsigned char val) -> void |
5 | 233 | { |
234 | *m_cursor++ = val; | |
235 | m_writtenLength++; | |
236 | } | |
237 | ||
238 | // ------------------------------------------------------------------------------------------------- | |
239 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
240 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
241 | Bytestream::write (const unsigned char* val, unsigned int length) -> void |
5 | 242 | { |
243 | grow_to_fit (length); | |
244 | memcpy (m_cursor, val, length); | |
245 | m_cursor += length; | |
246 | m_writtenLength += length; | |
247 | } | |
248 | ||
249 | // ------------------------------------------------------------------------------------------------- | |
250 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
251 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
252 | Bytestream::grow_to_fit (unsigned long bytes) -> void |
5 | 253 | { |
254 | if (space_left() < bytes) | |
255 | resize (allocated_size() + bytes + 128); | |
256 | } | |
257 | ||
258 | // ------------------------------------------------------------------------------------------------- | |
259 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
260 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
261 | Bytestream::write_byte (char val) -> void |
5 | 262 | { |
263 | grow_to_fit (1); | |
264 | write (val); | |
265 | } | |
266 | ||
267 | // ------------------------------------------------------------------------------------------------- | |
268 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
269 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
270 | Bytestream::write_short (short int val) -> void |
5 | 271 | { |
272 | grow_to_fit (2); | |
273 | ||
274 | for (int i = 0; i < 2; ++i) | |
275 | write ((val >> (i * 8)) & 0xFF); | |
276 | } | |
277 | ||
278 | // ------------------------------------------------------------------------------------------------- | |
279 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
280 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
281 | Bytestream::write_long (long int val) -> void |
5 | 282 | { |
283 | grow_to_fit (4); | |
284 | ||
285 | for (int i = 0; i < 4; ++i) | |
286 | write ((val >> (i * 8)) & 0xFF); | |
287 | } | |
288 | ||
289 | // ------------------------------------------------------------------------------------------------- | |
290 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
291 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
292 | Bytestream::write_float (float val) -> void |
5 | 293 | { |
294 | // I know this is probably dangerous but this is what Zandronum does so yeah | |
295 | write_long (reinterpret_cast<int&> (val)); | |
296 | } | |
297 | ||
298 | // ------------------------------------------------------------------------------------------------- | |
299 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
300 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
301 | Bytestream::write_string (const String& val) -> void |
5 | 302 | { |
303 | grow_to_fit (val.length() + 1); | |
304 | write (reinterpret_cast<const unsigned char*> (val.chars()), val.length()); | |
305 | write (0); | |
306 | } | |
307 | ||
308 | // ------------------------------------------------------------------------------------------------- | |
309 | // | |
18
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
310 | METHOD |
56a1ac7d931b
- converted bytestream to use trailing return types
Teemu Piippo <crimsondusk64@gmail.com>
parents:
13
diff
changeset
|
311 | Bytestream::write_buffer (const Bytestream& other) -> void |
5 | 312 | { |
313 | write (other.data(), other.written_length()); | |
314 | } |