Skip to content

Commit 56c8dcc

Browse files
authored
fix some typos (#472)
1 parent 642d0cc commit 56c8dcc

11 files changed

Lines changed: 19 additions & 19 deletions

File tree

game/bink/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
### This folder contains a Bink-video codec
22

3-
Implementation is based on ffmepeg library source code (LGPLv2.1+).
4-
Codec itself is completly independent unit, wich does not require any other OpenGothic parts in order to work - fell free to use it for your open-source game remake.
3+
Implementation is based on ffmpeg library source code (LGPLv2.1+).
4+
Codec itself is completely independent unit, which does not require any other OpenGothic parts in order to work - fell free to use it for your open-source game remake.
55

66
Classes:
77
* Bink::Video - video codec

game/camera.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,9 @@ Matrix4x4 Camera::mkViewShadow(const Vec3& cameraPos, float rotation, const Temp
321321
view.set(1,1, dz*smWidthInv);
322322
}
323323

324-
// strectch shadowmap on light dir
324+
// stretch shadowmap on light dir
325325
if(ldir.y!=0.f) {
326-
// stetch view to camera
326+
// stretch view to camera
327327
float r0 = std::fmod(rotation, 360.f);
328328
float r = std::fmod(std::atan2(ldir.z,ldir.x)*180.f/float(M_PI), 360.f);
329329
r -= r0;

game/dmusic/hydra.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ std::unique_ptr<float[]> Hydra::allocSamples(const std::vector<Wave>& wave,std::
351351
std::strncpy(sx.sampleName,wav.info.inam.c_str(),19);
352352
sx.start = tsf_u32(wavStart);
353353
sx.end = tsf_u32(wavStart+wavSize);
354-
sx.startLoop = 0; // will be overriden, later
354+
sx.startLoop = 0; // will be overridden, later
355355
sx.endLoop = 0;
356356
sx.sampleRate = wav.wfmt.dwSamplesPerSec;
357357
sx.originalPitch = uint8_t(wav.waveSample.usUnityNote);

game/game/compatibility/ikarus.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ Ikarus::Ikarus(GameScript& /*owner*/, phoenix::vm& vm) : vm(vm)
2323
/*:owner(owner)*/ {
2424
Log::i("DMA mod detected: Ikarus");
2525

26-
// build-in data with assumed address
26+
// built-in data with assumed address
2727
versionHint = 504628679; // G2
2828
allocator.pin(&versionHint, GothicFirstInstructionAddress, 4, "MEMINT_ReportVersionCheck");
2929
allocator.pin(&oGame_Pointer, MEMINT_oGame_Pointer_Address, 4, "oGame*");
3030
allocator.pin(&parserProxy, ContentParserAddress, sizeof(parserProxy), "zCParser proxy");
3131

32-
// build-in data without assumed address
32+
// built-in data without assumed address
3333
oGame_Pointer = allocator.pin(&gameProxy, 0, sizeof(gameProxy), "oGame");
3434

3535
// Note: no inline asm

game/graphics/mesh/animationsolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ const Animation::Sequence* AnimationSolver::implSolveAnim(AnimationSolver::Anim
240240
s = solveFrm("T_%sPARADEJUMPB",st);
241241
if(s!=nullptr)
242242
return s;
243-
// This is bases on original game: if no move-back animation, even in water, game defaults to standart walk-bak
243+
// This is bases on original game: if no move-back animation, even in water, game defaults to standard walk-back
244244
return solveFrm("T_%sJUMPB",st);
245245
}
246246
// Rotation

game/graphics/mesh/pose.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Pose final {
2020

2121
enum Flags {
2222
NoFlags = 0,
23-
NoTranslation = 1, // usefull for mobsi
23+
NoTranslation = 1, // useful for mobsi
2424
};
2525

2626
enum StartHint : uint8_t {

game/graphics/objectsbucket.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,8 @@ void ObjectsBucket::preFrameUpdate(uint8_t fId) {
476476
auto pos = v.pos;
477477
float shift = v.pos[3][0]*scene.windDir.x + v.pos[3][2]*scene.windDir.y;
478478

479-
static const uint64_t preiod = scene.windPeriod;
480-
float a = float(scene.tickCount%preiod)/float(preiod);
479+
static const uint64_t period = scene.windPeriod;
480+
float a = float(scene.tickCount%period)/float(period);
481481
a = a*2.f-1.f;
482482
a = std::cos(float(a*M_PI) + shift*0.0001f);
483483

@@ -515,7 +515,7 @@ size_t ObjectsBucket::alloc(const StaticMesh& mesh, size_t iboOffset, size_t ibo
515515

516516
bool useBlas = true;
517517
if(mat.alpha==Material::Solid && objType==Type::Landscape)
518-
useBlas = false; // handles separetly
518+
useBlas = false; // handles separately
519519

520520
if(objType!=Type::Landscape && objType!=Type::Static)
521521
useBlas = false; // not supported

game/graphics/sceneglobals.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ SceneGlobals::~SceneGlobals() {
5353
void SceneGlobals::initSettings() {
5454
zWindEnabled = Gothic::inst().settingsGetI("ENGINE","zWindEnabled")!=0;
5555

56-
float peroid = Gothic::inst().settingsGetF("ENGINE","zWindCycleTime");
57-
float peroidV = Gothic::inst().settingsGetF("ENGINE","zWindCycleTimeVar");
58-
windPeriod = uint64_t((peroid+peroidV)*1000.f);
56+
float period = Gothic::inst().settingsGetF("ENGINE","zWindCycleTime");
57+
float periodV = Gothic::inst().settingsGetF("ENGINE","zWindCycleTimeVar");
58+
windPeriod = uint64_t((period+periodV)*1000.f);
5959
if(windPeriod<=0) {
6060
windPeriod = 1;
6161
zWindEnabled = false;

game/physics/dynamicworld.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ float DynamicWorld::soundOclusion(const Tempest::Vec3& from, const Tempest::Vec3
645645
}
646646

647647
float tlen = (callback.m_rayFromWorld-callback.m_rayToWorld).length();
648-
// let's say: 1.5 meter wall blocks sound completly :)
648+
// let's say: 1.5 meter wall blocks sound completely :)
649649
return (tlen*fr)/1.5f;
650650
}
651651

game/world/objects/interactive.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -937,9 +937,9 @@ bool Interactive::setAnim(Npc* npc, Anim dir) {
937937

938938
uint64_t aniT = sqNpc==nullptr ? 0 : uint64_t(sqNpc->totalTime());
939939
if(aniT==0) {
940-
/* Note: testing shows that in vanilla only npc animation maters.
940+
/* Note: testing shows that in vanilla only npc animation matters.
941941
* testcase: chest animation
942-
* modsi timings only here for completness
942+
* modsi timings only here for completeness
943943
*/
944944
aniT = sqMob==nullptr ? 0 : uint64_t(sqMob->totalTime());
945945
}

0 commit comments

Comments
 (0)