| 1 |
maksbotan 12/05/30 10:21:55 |
| 2 |
|
| 3 |
Added: doomsday-1.9.8-2to3.patch |
| 4 |
doomsday-1.9.8-openal-link.patch |
| 5 |
Log: |
| 6 |
Bump to 1.9.8, bug 410043. Remake wrapper generation, bump to eapi4 |
| 7 |
|
| 8 |
(Portage version: 2.1.10.63/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 games-fps/doomsday/files/doomsday-1.9.8-2to3.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doomsday/files/doomsday-1.9.8-2to3.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doomsday/files/doomsday-1.9.8-2to3.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: doomsday-1.9.8-2to3.patch |
| 17 |
=================================================================== |
| 18 |
--- ./build/mac/createfont_osx.py (original) |
| 19 |
+++ ./build/mac/createfont_osx.py (refactored) |
| 20 |
@@ -36,7 +36,7 @@ |
| 21 |
|
| 22 |
|
| 23 |
def _getBitmapImageRep(size, hasAlpha=True): |
| 24 |
- width, height = map(int, size) |
| 25 |
+ width, height = list(map(int, size)) |
| 26 |
return NSBitmapImageRep.alloc().initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_(None, width, height, 8, 4, hasAlpha, False, NSDeviceRGBColorSpace, width*4, 32) |
| 27 |
|
| 28 |
|
| 29 |
@@ -55,7 +55,7 @@ |
| 30 |
|
| 31 |
def filter_range(n): |
| 32 |
offset = 1 # - int(n/5) |
| 33 |
- return range(-n/2 + offset, n/2 + offset) |
| 34 |
+ return list(range(-n/2 + offset, n/2 + offset)) |
| 35 |
|
| 36 |
|
| 37 |
class SysFont(object): |
| 38 |
@@ -79,7 +79,7 @@ |
| 39 |
self._isBold and 'Bold' or '', |
| 40 |
self._isOblique and 'Oblique' or '') |
| 41 |
self._font = NSFont.fontWithName_size_(name, self._size) |
| 42 |
- print name, self._font |
| 43 |
+ print(name, self._font) |
| 44 |
if self._font is None: |
| 45 |
if self._isBold: |
| 46 |
self._font = NSFont.boldSystemFontOfSize(self._size) |
| 47 |
@@ -121,10 +121,10 @@ |
| 48 |
self._isUnderline = isUnderline |
| 49 |
|
| 50 |
def size(self, text): |
| 51 |
- return tuple(map(int,map(math.ceil, NSString.sizeWithAttributes_(text, { |
| 52 |
+ return tuple(map(int,list(map(math.ceil, NSString.sizeWithAttributes_(text, { |
| 53 |
NSFontAttributeName: self._font, |
| 54 |
NSUnderlineStyleAttributeName: self._isUnderline and 1.0 or 0, |
| 55 |
- })))) |
| 56 |
+ }))))) |
| 57 |
|
| 58 |
def advancement(self, glyph): |
| 59 |
return tuple(self._font.advancementForGlyph_(ord(glyph))) |
| 60 |
@@ -196,7 +196,7 @@ |
| 61 |
[6, 36, 90, 120, 90, 36, 6], |
| 62 |
[1, 6, 15, 20, 15, 6, 1]] |
| 63 |
else: |
| 64 |
- print "factors for filter size", filter_size, "not defined!" |
| 65 |
+ print("factors for filter size", filter_size, "not defined!") |
| 66 |
factors = 0 |
| 67 |
|
| 68 |
# Filter a shadow. |
| 69 |
@@ -269,7 +269,7 @@ |
| 70 |
|
| 71 |
if __name__=='__main__': |
| 72 |
if len(sys.argv) < 5: |
| 73 |
- print "usage: " + sys.argv[0] + " (font-name) (font-size) (texture-width) (output-file)" |
| 74 |
+ print("usage: " + sys.argv[0] + " (font-name) (font-size) (texture-width) (output-file)") |
| 75 |
sys.exit(0) |
| 76 |
|
| 77 |
out_filename = sys.argv[4] |
| 78 |
@@ -286,17 +286,17 @@ |
| 79 |
|
| 80 |
texture_width = int(sys.argv[3]) |
| 81 |
font_point_height = s.get_height() |
| 82 |
- print "Font texture width =", texture_width |
| 83 |
- print "Line height =", font_point_height, "pt" |
| 84 |
- print "Font size =", point_size, "pt" |
| 85 |
+ print("Font texture width =", texture_width) |
| 86 |
+ print("Line height =", font_point_height, "pt") |
| 87 |
+ print("Font size =", point_size, "pt") |
| 88 |
|
| 89 |
ascent = s.get_ascent() |
| 90 |
descent = s.get_descent() |
| 91 |
- print "Ascent =", ascent, "pt Descent =", descent, "pt" |
| 92 |
- |
| 93 |
- print "Shadow filter is sized %i for this font." % s.shadow_filter_size() |
| 94 |
+ print("Ascent =", ascent, "pt Descent =", descent, "pt") |
| 95 |
+ |
| 96 |
+ print("Shadow filter is sized %i for this font." % s.shadow_filter_size()) |
| 97 |
border_size = s.border_size() |
| 98 |
- print "Glyph borders are %i pixels wide." % border_size |
| 99 |
+ print("Glyph borders are %i pixels wide." % border_size) |
| 100 |
|
| 101 |
rover = (0, 0) |
| 102 |
line_height = 0 |
| 103 |
@@ -304,7 +304,7 @@ |
| 104 |
used_pixels = 0 |
| 105 |
|
| 106 |
# Only the basic ASCII set, and some specific characters. |
| 107 |
- char_range = range(0x20, 0x7F) + [0x96, 0x97, 0xA3, 0xA4, 0xA9, 0xB0, 0xB1] |
| 108 |
+ char_range = list(range(0x20, 0x7F)) + [0x96, 0x97, 0xA3, 0xA4, 0xA9, 0xB0, 0xB1] |
| 109 |
for code in char_range: |
| 110 |
glyph = Glyph(code) |
| 111 |
try: |
| 112 |
@@ -320,7 +320,7 @@ |
| 113 |
# No, move to the new row. |
| 114 |
rover = (0, rover[1] + line_height) |
| 115 |
texture_height += line_height |
| 116 |
- print "Finished a %i pixels tall line." % line_height |
| 117 |
+ print("Finished a %i pixels tall line." % line_height) |
| 118 |
line_height = 0 |
| 119 |
|
| 120 |
glyph.pos = rover |
| 121 |
@@ -332,20 +332,20 @@ |
| 122 |
glyphs.append(glyph) |
| 123 |
#except Exception, x: |
| 124 |
except KeyboardInterrupt: |
| 125 |
- print "Code %i: Failed to render." % code |
| 126 |
- print x |
| 127 |
- |
| 128 |
- print "Finished rendering %i glyphs." % len(glyphs) |
| 129 |
+ print("Code %i: Failed to render." % code) |
| 130 |
+ print(x) |
| 131 |
+ |
| 132 |
+ print("Finished rendering %i glyphs." % len(glyphs)) |
| 133 |
actual_line_height = glyphs[0].dims[1] - border_size*2 |
| 134 |
- print "Actual line height is %i pixels." % actual_line_height |
| 135 |
- |
| 136 |
- print "Size of the finished texture is %i x %i." % (texture_width, texture_height) |
| 137 |
+ print("Actual line height is %i pixels." % actual_line_height) |
| 138 |
+ |
| 139 |
+ print("Size of the finished texture is %i x %i." % (texture_width, texture_height)) |
| 140 |
|
| 141 |
actual_height = pow2(texture_height) |
| 142 |
total_pixels = texture_width * actual_height |
| 143 |
|
| 144 |
- print "Unused texture area: %.2f %%" % (100*(1.0 - used_pixels/float(total_pixels))) |
| 145 |
- print "Writing output to file: %s" % out_filename |
| 146 |
+ print("Unused texture area: %.2f %%" % (100*(1.0 - used_pixels/float(total_pixels)))) |
| 147 |
+ print("Writing output to file: %s" % out_filename) |
| 148 |
|
| 149 |
out = file(out_filename, 'wb') |
| 150 |
|
| 151 |
@@ -365,10 +365,10 @@ |
| 152 |
scale = float(actual_line_height) / font_point_height |
| 153 |
pixel_ascent = int(math.ceil(scale * ascent)) |
| 154 |
pixel_descent = int(math.ceil(scale * descent)) |
| 155 |
- print " Pixel ascent/descent:", pixel_ascent, '/', pixel_descent |
| 156 |
+ print(" Pixel ascent/descent:", pixel_ascent, '/', pixel_descent) |
| 157 |
|
| 158 |
pixel_line_height = int(scale * font_point_height) |
| 159 |
- print " Pixel line height:", pixel_line_height |
| 160 |
+ print(" Pixel line height:", pixel_line_height) |
| 161 |
|
| 162 |
# Ascent and descent. |
| 163 |
out.write(struct.pack('<HHH', pixel_line_height, pixel_ascent, pixel_descent)) |
| 164 |
@@ -379,7 +379,7 @@ |
| 165 |
g.dims[0], g.dims[1])) |
| 166 |
|
| 167 |
# Glyph map. |
| 168 |
- print " Writing glyph map..." |
| 169 |
+ print(" Writing glyph map...") |
| 170 |
for y in range(texture_height): |
| 171 |
for x in range(texture_width): |
| 172 |
pixel = find_pixel(glyphs, x, y) |
| 173 |
--- ./build/scripts/packres.py (original) |
| 174 |
+++ ./build/scripts/packres.py (refactored) |
| 175 |
@@ -6,8 +6,8 @@ |
| 176 |
import sys, os, os.path, zipfile |
| 177 |
|
| 178 |
if len(sys.argv) < 2: |
| 179 |
- print "Usage: %s pk3-target-dir" % sys.argv[0] |
| 180 |
- print "(run in build/scripts/)" |
| 181 |
+ print("Usage: %s pk3-target-dir" % sys.argv[0]) |
| 182 |
+ print("(run in build/scripts/)") |
| 183 |
sys.exit(0) |
| 184 |
|
| 185 |
# Check quiet flag. |
| 186 |
@@ -27,7 +27,7 @@ |
| 187 |
self.files += fileNamesArray |
| 188 |
|
| 189 |
def msg(self, text): |
| 190 |
- if not quietMode: print text |
| 191 |
+ if not quietMode: print(text) |
| 192 |
|
| 193 |
def create(self, name): |
| 194 |
full_name = os.path.join(target_dir, name) |
| 195 |
@@ -61,7 +61,7 @@ |
| 196 |
process_dir(full_src, dest) |
| 197 |
|
| 198 |
# Write it out. |
| 199 |
- print "Created %s (with %i files)." % (os.path.normpath(full_name), len(pk3.namelist())) |
| 200 |
+ print("Created %s (with %i files)." % (os.path.normpath(full_name), len(pk3.namelist()))) |
| 201 |
pk3.close() |
| 202 |
|
| 203 |
# First up, doomsday.pk3. |
| 204 |
--- ./build/scripts/wadcompiler.py (original) |
| 205 |
+++ ./build/scripts/wadcompiler.py (refactored) |
| 206 |
@@ -49,7 +49,7 @@ |
| 207 |
self.type = self.file.read(4) |
| 208 |
count = struct.unpack('<I', self.file.read(4))[0] |
| 209 |
info_offset = struct.unpack('<I', self.file.read(4))[0] |
| 210 |
- print "%s, type=%s, count=%i, info_offset=%i" % (self.file_name, self.type, count, info_offset) |
| 211 |
+ print("%s, type=%s, count=%i, info_offset=%i" % (self.file_name, self.type, count, info_offset)) |
| 212 |
self.lumps = [] |
| 213 |
# Read the info table. |
| 214 |
self.file.seek(info_offset) |
| 215 |
@@ -68,7 +68,7 @@ |
| 216 |
self.lumps.append( Lump(info[2], data, info[0]) ) |
| 217 |
|
| 218 |
def write(self): |
| 219 |
- print 'writing', self.file_name |
| 220 |
+ print('writing', self.file_name) |
| 221 |
self.file.truncate() |
| 222 |
self.file.seek(0) |
| 223 |
# Type. |
| 224 |
@@ -104,17 +104,17 @@ |
| 225 |
|
| 226 |
def set_type(self, new_type): |
| 227 |
if len(new_type) != 4: |
| 228 |
- print "'%s' is not a valid type. Must have 4 chars." % new_type |
| 229 |
+ print("'%s' is not a valid type. Must have 4 chars." % new_type) |
| 230 |
else: |
| 231 |
- print 'setting type to %s' % new_type |
| 232 |
+ print('setting type to %s' % new_type) |
| 233 |
self.type = new_type |
| 234 |
|
| 235 |
def list(self): |
| 236 |
for i in range(len(self.lumps)): |
| 237 |
lump = self.lumps[i] |
| 238 |
- print "%5i -- %-8s (at %8i, %8i bytes)" % (i, lump.name, lump.offset, |
| 239 |
- len(lump.data)) |
| 240 |
- print "%i lumps total." % len(self.lumps) |
| 241 |
+ print("%5i -- %-8s (at %8i, %8i bytes)" % (i, lump.name, lump.offset, |
| 242 |
+ len(lump.data))) |
| 243 |
+ print("%i lumps total." % len(self.lumps)) |
| 244 |
|
| 245 |
def insert(self, at_lump, names): |
| 246 |
# Where to insert? |
| 247 |
@@ -128,13 +128,13 @@ |
| 248 |
at = i |
| 249 |
break |
| 250 |
if at == -1: |
| 251 |
- print "could not find insert point, aborting" |
| 252 |
+ print("could not find insert point, aborting") |
| 253 |
return |
| 254 |
- print "inserting at index %i..." % at |
| 255 |
+ print("inserting at index %i..." % at) |
| 256 |
|
| 257 |
for name in names: |
| 258 |
real, arch = split_name(name) |
| 259 |
- print "inserting %s as %s" % (real, valid_lump_name(arch)) |
| 260 |
+ print("inserting %s as %s" % (real, valid_lump_name(arch))) |
| 261 |
self.lumps.insert(at, Lump(valid_lump_name(arch), |
| 262 |
file(real, 'rb').read(), 0)) |
| 263 |
|
| 264 |
@@ -164,28 +164,28 @@ |
| 265 |
break |
| 266 |
else: |
| 267 |
nice_name += ext |
| 268 |
- print "extracting", lump.name, "(%i bytes) as %s" % (len(lump.data), nice_name) |
| 269 |
+ print("extracting", lump.name, "(%i bytes) as %s" % (len(lump.data), nice_name)) |
| 270 |
f = file(nice_name, 'wb') |
| 271 |
f.write(lump.data) |
| 272 |
f.close() |
| 273 |
|
| 274 |
|
| 275 |
def usage(): |
| 276 |
- print 'Usage: %s [command] [wad] [files]' % sys.argv[0] |
| 277 |
- print 'command = l(ist) | c(reate PWAD) | C(reate IWAD) | x(tract) | a(ppend) | i(nsert) | t(ype)' |
| 278 |
- print 'Examples:' |
| 279 |
- print '%s l some.wad' % sys.argv[0] |
| 280 |
- print '%s c new.wad LUMP1 LUMP2 LUMP3' % sys.argv[0] |
| 281 |
- print '%s i LUMP2 some.wad LUMP5 LUMP6 LUMP7 (at LUMP2)' % sys.argv[0] |
| 282 |
- print '%s a existing.wad LUMP4 LUMP5' % sys.argv[0] |
| 283 |
- print '%s x existing.wad (extracts all lumps)' % sys.argv[0] |
| 284 |
- print '%s x existing.wad LUMP4 (extracts selected lumps)' % sys.argv[0] |
| 285 |
- print '%s t existing.wad IWAD' % sys.argv[0] |
| 286 |
- print 'You can specify files as realfilename@LUMPNAME.' |
| 287 |
+ print('Usage: %s [command] [wad] [files]' % sys.argv[0]) |
| 288 |
+ print('command = l(ist) | c(reate PWAD) | C(reate IWAD) | x(tract) | a(ppend) | i(nsert) | t(ype)') |
| 289 |
+ print('Examples:') |
| 290 |
+ print('%s l some.wad' % sys.argv[0]) |
| 291 |
+ print('%s c new.wad LUMP1 LUMP2 LUMP3' % sys.argv[0]) |
| 292 |
+ print('%s i LUMP2 some.wad LUMP5 LUMP6 LUMP7 (at LUMP2)' % sys.argv[0]) |
| 293 |
+ print('%s a existing.wad LUMP4 LUMP5' % sys.argv[0]) |
| 294 |
+ print('%s x existing.wad (extracts all lumps)' % sys.argv[0]) |
| 295 |
+ print('%s x existing.wad LUMP4 (extracts selected lumps)' % sys.argv[0]) |
| 296 |
+ print('%s t existing.wad IWAD' % sys.argv[0]) |
| 297 |
+ print('You can specify files as realfilename@LUMPNAME.') |
| 298 |
|
| 299 |
# Call main function. |
| 300 |
-print 'WAD Compiler by skyjake@×××××××××××××××××.net' |
| 301 |
-print '$Date: 2012/05/30 10:21:55 $' |
| 302 |
+print('WAD Compiler by skyjake@×××××××××××××××××.net') |
| 303 |
+print('$Date: 2012/05/30 10:21:55 $') |
| 304 |
|
| 305 |
# Check the args. |
| 306 |
if len(sys.argv) < 3: |
| 307 |
@@ -219,7 +219,7 @@ |
| 308 |
try: |
| 309 |
wad = Wad(wad_name, mode) |
| 310 |
except: |
| 311 |
- print 'Failure to open %s.' % wad_name |
| 312 |
+ print('Failure to open %s.' % wad_name) |
| 313 |
import traceback |
| 314 |
traceback.print_exc() |
| 315 |
sys.exit(2) |
| 316 |
--- ./engine/scripts/makedmt.py (original) |
| 317 |
+++ ./engine/scripts/makedmt.py (refactored) |
| 318 |
@@ -118,7 +118,7 @@ |
| 319 |
# Translate the type into a real C type. |
| 320 |
if '_s' in c_type: |
| 321 |
c_type = 'struct ' + c_type |
| 322 |
- for symbol, real in type_replacements.items(): |
| 323 |
+ for symbol, real in list(type_replacements.items()): |
| 324 |
c_type = c_type.replace(symbol, real) |
| 325 |
|
| 326 |
# Add some visual padding to align the members. |
| 327 |
|
| 328 |
|
| 329 |
|
| 330 |
1.1 games-fps/doomsday/files/doomsday-1.9.8-openal-link.patch |
| 331 |
|
| 332 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doomsday/files/doomsday-1.9.8-openal-link.patch?rev=1.1&view=markup |
| 333 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doomsday/files/doomsday-1.9.8-openal-link.patch?rev=1.1&content-type=text/plain |
| 334 |
|
| 335 |
Index: doomsday-1.9.8-openal-link.patch |
| 336 |
=================================================================== |
| 337 |
--- doomsday/plugins/openal/src/driver_openal.cpp 2012-05-15 06:01:38.000000000 +0200 |
| 338 |
+++ doomsday/plugins/openal/src/driver_openal.cpp 2012-05-29 07:37:21.170639342 +0200 |
| 339 |
@@ -66,6 +66,7 @@ ALenum(*EAXGet) (const struct _GUID* pro |
| 340 |
ALenum(*EAXSet) (const struct _GUID* propertySetID, ALuint prop, ALuint source, ALvoid* value, ALuint size); |
| 341 |
#endif |
| 342 |
|
| 343 |
+extern "C" { |
| 344 |
int DS_Init(void); |
| 345 |
void DS_Shutdown(void); |
| 346 |
void DS_Event(int type); |
| 347 |
@@ -83,6 +84,7 @@ void DS_SFX_Setv(sfxbuffer_t* buf, int p |
| 348 |
void DS_SFX_Listener(int prop, float value); |
| 349 |
void DS_SFX_Listenerv(int prop, float* values); |
| 350 |
int DS_SFX_Getv(int prop, void* values); |
| 351 |
+} |
| 352 |
|
| 353 |
#ifdef WIN32 |
| 354 |
// EAX 2.0 GUIDs |
| 355 |
@@ -134,14 +136,14 @@ static void loadExtensions(void) |
| 356 |
#endif |
| 357 |
} |
| 358 |
|
| 359 |
-int DS_Init(void) |
| 360 |
+extern "C" int DS_Init(void) |
| 361 |
{ |
| 362 |
// Already initialized? |
| 363 |
if(initOk) return true; |
| 364 |
|
| 365 |
// Open a playback device. |
| 366 |
/// @todo Shouldn't we use the system default device? |
| 367 |
- device = alcOpenDevice((ALCchar*) "DirectSound3D"); |
| 368 |
+ device = alcOpenDevice((ALCchar*) NULL); |
| 369 |
if(!device) |
| 370 |
{ |
| 371 |
Con_Message("OpenAL init failed (device: DirectSound3D).\n"); |
| 372 |
@@ -167,7 +169,7 @@ int DS_Init(void) |
| 373 |
return true; |
| 374 |
} |
| 375 |
|
| 376 |
-void DS_Shutdown(void) |
| 377 |
+extern "C" void DS_Shutdown(void) |
| 378 |
{ |
| 379 |
if(!initOk) return; |
| 380 |
|
| 381 |
@@ -185,12 +187,12 @@ void DS_Event(int /*type*/) |
| 382 |
// Not supported. |
| 383 |
} |
| 384 |
|
| 385 |
-int DS_SFX_Init(void) |
| 386 |
+extern "C" int DS_SFX_Init(void) |
| 387 |
{ |
| 388 |
return true; |
| 389 |
} |
| 390 |
|
| 391 |
-sfxbuffer_t* DS_SFX_CreateBuffer(int flags, int bits, int rate) |
| 392 |
+extern "C" sfxbuffer_t* DS_SFX_CreateBuffer(int flags, int bits, int rate) |
| 393 |
{ |
| 394 |
sfxbuffer_t* buf; |
| 395 |
ALuint bufName, srcName; |
| 396 |
@@ -236,7 +238,7 @@ sfxbuffer_t* DS_SFX_CreateBuffer(int fla |
| 397 |
return buf; |
| 398 |
} |
| 399 |
|
| 400 |
-void DS_SFX_DestroyBuffer(sfxbuffer_t* buf) |
| 401 |
+extern "C" void DS_SFX_DestroyBuffer(sfxbuffer_t* buf) |
| 402 |
{ |
| 403 |
ALuint srcName, bufName; |
| 404 |
|
| 405 |
@@ -251,7 +253,7 @@ void DS_SFX_DestroyBuffer(sfxbuffer_t* b |
| 406 |
Z_Free(buf); |
| 407 |
} |
| 408 |
|
| 409 |
-void DS_SFX_Load(sfxbuffer_t* buf, struct sfxsample_s* sample) |
| 410 |
+extern "C" void DS_SFX_Load(sfxbuffer_t* buf, struct sfxsample_s* sample) |
| 411 |
{ |
| 412 |
if(!buf || !sample) return; |
| 413 |
|
| 414 |
@@ -277,7 +279,7 @@ void DS_SFX_Load(sfxbuffer_t* buf, struc |
| 415 |
/** |
| 416 |
* Stops the buffer and makes it forget about its sample. |
| 417 |
*/ |
| 418 |
-void DS_SFX_Reset(sfxbuffer_t* buf) |
| 419 |
+extern "C" void DS_SFX_Reset(sfxbuffer_t* buf) |
| 420 |
{ |
| 421 |
if(!buf) return; |
| 422 |
|
| 423 |
@@ -285,7 +287,7 @@ void DS_SFX_Reset(sfxbuffer_t* buf) |
| 424 |
buf->sample = NULL; |
| 425 |
} |
| 426 |
|
| 427 |
-void DS_SFX_Play(sfxbuffer_t* buf) |
| 428 |
+extern "C" void DS_SFX_Play(sfxbuffer_t* buf) |
| 429 |
{ |
| 430 |
ALuint source; |
| 431 |
|
| 432 |
@@ -310,7 +312,7 @@ void DS_SFX_Play(sfxbuffer_t* buf) |
| 433 |
buf->flags |= SFXBF_PLAYING; |
| 434 |
} |
| 435 |
|
| 436 |
-void DS_SFX_Stop(sfxbuffer_t* buf) |
| 437 |
+extern "C" void DS_SFX_Stop(sfxbuffer_t* buf) |
| 438 |
{ |
| 439 |
if(!buf || !buf->sample) return; |
| 440 |
|
| 441 |
@@ -318,7 +320,7 @@ void DS_SFX_Stop(sfxbuffer_t* buf) |
| 442 |
buf->flags &= ~SFXBF_PLAYING; |
| 443 |
} |
| 444 |
|
| 445 |
-void DS_SFX_Refresh(sfxbuffer_t* buf) |
| 446 |
+extern "C" void DS_SFX_Refresh(sfxbuffer_t* buf) |
| 447 |
{ |
| 448 |
ALint state; |
| 449 |
|
| 450 |
@@ -368,7 +370,7 @@ static void setPan(ALuint source, float |
| 451 |
alSourcefv(source, AL_POSITION, pos); |
| 452 |
} |
| 453 |
|
| 454 |
-void DS_SFX_Set(sfxbuffer_t* buf, int prop, float value) |
| 455 |
+extern "C" void DS_SFX_Set(sfxbuffer_t* buf, int prop, float value) |
| 456 |
{ |
| 457 |
ALuint source; |
| 458 |
|
| 459 |
@@ -411,7 +413,7 @@ void DS_SFX_Set(sfxbuffer_t* buf, int pr |
| 460 |
} |
| 461 |
} |
| 462 |
|
| 463 |
-void DS_SFX_Setv(sfxbuffer_t* buf, int prop, float* values) |
| 464 |
+extern "C" void DS_SFX_Setv(sfxbuffer_t* buf, int prop, float* values) |
| 465 |
{ |
| 466 |
ALuint source; |
| 467 |
|
| 468 |
@@ -435,7 +437,7 @@ void DS_SFX_Setv(sfxbuffer_t* buf, int p |
| 469 |
} |
| 470 |
} |
| 471 |
|
| 472 |
-void DS_SFX_Listener(int prop, float value) |
| 473 |
+extern "C" void DS_SFX_Listener(int prop, float value) |
| 474 |
{ |
| 475 |
switch(prop) |
| 476 |
{ |
| 477 |
@@ -451,7 +453,7 @@ void DS_SFX_Listener(int prop, float val |
| 478 |
} |
| 479 |
} |
| 480 |
|
| 481 |
-void DS_SFX_Listenerv(int prop, float* values) |
| 482 |
+extern "C" void DS_SFX_Listenerv(int prop, float* values) |
| 483 |
{ |
| 484 |
float ori[6]; |
| 485 |
|
| 486 |
@@ -489,7 +491,7 @@ void DS_SFX_Listenerv(int prop, float* v |
| 487 |
} |
| 488 |
} |
| 489 |
|
| 490 |
-int DS_SFX_Getv(int /*prop*/, void* /*values*/) |
| 491 |
+extern "C" int DS_SFX_Getv(int /*prop*/, void* /*values*/) |
| 492 |
{ |
| 493 |
// Stub. |
| 494 |
return 0; |
Archives