zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed DUMB-compile problem with gcc. 

SVN r1679 (trunk)
This commit is contained in:
Christoph Oelckers 2009-06-24 22:16:51 +00:00
parent b0dd2409ff
commit 6d1cee3398
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dumb/src/it/itrender.c
View File

@ -3555,14 +3555,15 @@ static void process_playing(DUMB_IT_SIGRENDERER *sigrenderer, IT_PLAYING *playin
playing->sample_vibrato_time += playing->sample->vibrato_speed; playing->sample_vibrato_time += playing->sample->vibrato_speed;
} }
#if !defined(_WIN32) || !defined(__GNUC__) // Apparently some GCCs have problems here so renaming the function sounds like a better idea.
static double log2(double x) {return log(x)/log(2.0f);} //#if !defined(_WIN32) || !defined(__GNUC__)
#endif static double mylog2(double x) {return log(x)/log(2.0f);}
//#endif
static int delta_to_note(float delta, int base) static int delta_to_note(float delta, int base)
{ {
double note; double note;
note = log2(delta * 65536.f / (float)base)*12.0f+60.5f; note = mylog2(delta * 65536.f / (float)base)*12.0f+60.5f;
if (note > 119) note = 119; if (note > 119) note = 119;
else if (note < 0) note = 0; else if (note < 0) note = 0;
return (int)note; return (int)note;
@ -3985,7 +3986,6 @@ static int process_tick(DUMB_IT_SIGRENDERER *sigrenderer)
process_all_playing(sigrenderer); process_all_playing(sigrenderer);
if (sigrenderer->tempo > 0)
{ {
LONG_LONG t = sigrenderer->sub_time_left + ((LONG_LONG)TICK_TIME_DIVIDEND << 16) / sigrenderer->tempo; LONG_LONG t = sigrenderer->sub_time_left + ((LONG_LONG)TICK_TIME_DIVIDEND << 16) / sigrenderer->tempo;
sigrenderer->time_left += (int)(t >> 16); sigrenderer->time_left += (int)(t >> 16);
@ -4792,13 +4792,6 @@ static DUMB_IT_SIGRENDERER *init_sigrenderer(DUMB_IT_SIGDATA *sigdata, int n_cha
sigrenderer->ramp_style = 0; sigrenderer->ramp_style = 0;
sigrenderer->globalvolume = sigdata->global_volume; sigrenderer->globalvolume = sigdata->global_volume;
sigrenderer->tempo = sigdata->tempo; sigrenderer->tempo = sigdata->tempo;
if (sigrenderer->tempo == 0)
{
free(callbacks);
dumb_destroy_click_remover_array(n_channels, cr);
free(sigrenderer);
return NULL;
}
for (i = 0; i < DUMB_IT_N_CHANNELS; i++) { for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
IT_CHANNEL *channel = &sigrenderer->channel[i]; IT_CHANNEL *channel = &sigrenderer->channel[i];

3
src/x86.h
View File

@ -1,6 +1,8 @@
#ifndef X86_H #ifndef X86_H
#define X86_H #define X86_H
#include "basictypes.h"
struct CPUInfo // 92 bytes struct CPUInfo // 92 bytes
{ {
char VendorID[16]; char VendorID[16];
@ -77,6 +79,7 @@ struct CPUInfo // 92 bytes
extern "C" CPUInfo CPU; extern "C" CPUInfo CPU;
struct PalEntry;
void CheckCPUID (CPUInfo *cpu); void CheckCPUID (CPUInfo *cpu);
void DumpCPUInfo (const CPUInfo *cpu); void DumpCPUInfo (const CPUInfo *cpu);